merge fix
authorBen Loftis <ben@harrisonconsoles.com>
Thu, 16 Jul 2015 21:13:24 +0000 (16:13 -0500)
committerBen Loftis <ben@harrisonconsoles.com>
Thu, 16 Jul 2015 21:13:24 +0000 (16:13 -0500)
commit46c83693284ece4a732d26e62113ea4ac584d539
tree6e191e809b84b1c4d2aa36af6e8878996a109332
parentedce75973c076ab1fa66cc6d601a30fcbbcd5dd4
parentd9c0aa4236796d981a5d939bbc5d0d5a2e1910fe
merge fix
gtk2_ardour/audio_region_view.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_drag.h
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_selection.cc