Really fixed conflicts. Ready to merge into trunk.
authorHans Fugal <hans@fugal.net>
Fri, 4 Aug 2006 03:42:34 +0000 (03:42 +0000)
committerHans Fugal <hans@fugal.net>
Fri, 4 Aug 2006 03:42:34 +0000 (03:42 +0000)
commit5756373841675a879833f98bb4008dd0c40714d3
tree5ab9e96d4e4314554a818b541bbc8e0e5f0c3e70
parent79986643c0c904f6574bb5323e2233a43a9e622e
Really fixed conflicts. Ready to merge into trunk.

git-svn-id: svn://localhost/ardour2/branches/undo@757 d708f5d6-7413-0410-9779-e7cbd77b26cf
gtk2_ardour/audio_region_view.cc
gtk2_ardour/editor_keyboard.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/region_gain_line.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_ui.cc