fix merge conflicts with master
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:42:40 +0000 (16:42 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:42:40 +0000 (16:42 -0400)
commit7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a
tree25e1b01865e76193f3c88483d4f9de1c8abf2f9d
parente6521bb0434d88802aa28e75235bc8c19ebb9262
parentf5191e62578bd2ba2b3e2adf8cfc3634aa4b929c
fix merge conflicts with master
18 files changed:
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/editor.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/utils.cc
gtk2_ardour/wscript
libs/ardour/graph.cc
libs/ardour/ltc_slave.cc
libs/ardour/midi_diskstream.cc
libs/ardour/region.cc
libs/ardour/wscript
wscript