fix SVN merge SNAFU causing double deletion
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 26 Oct 2006 18:38:42 +0000 (18:38 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 26 Oct 2006 18:38:42 +0000 (18:38 +0000)
commit34f4b98c349ac1cc0b6ba48f48418f1a3432dff7
tree69a9ea467692959a38b8a64cd7b78b951edfc748
parent6f0c82ee870c90c3daa627c1b8eb582296dd245d
fix SVN merge SNAFU causing double deletion

git-svn-id: svn://localhost/ardour2/trunk@1028 d708f5d6-7413-0410-9779-e7cbd77b26cf
libs/ardour/ardour/automation_event.h
libs/ardour/ardour/io.h
libs/ardour/ardour/redirect.h
libs/ardour/audioregion.cc
libs/ardour/automation_event.cc
libs/ardour/io.cc
libs/ardour/redirect.cc
libs/ardour/route.cc
libs/ardour/session_click.cc