Really fixed conflicts. Ready to merge into trunk.
[ardour.git] / gtk2_ardour / audio_region_view.cc
2006-08-04 Hans FugalReally fixed conflicts. Ready to merge into trunk.
2006-08-04 Hans Fugal r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600