fix merge conflict from master
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 00:11:15 +0000 (20:11 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 00:11:15 +0000 (20:11 -0400)
commit6a436fd826d1c9d88b60287696cc0836ccce35aa
tree460a08b4d46359b6b168ece26f592c75fc2fe41f
parentbb59def1ca8a21f915cf636dd1e54957df981656
parent4dc74ae2ea13d2e5a8b481961d507df1ff98df97
fix merge conflict from master
24 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/route_ui.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/transcode_ffmpeg.cc
gtk2_ardour/transcode_video_dialog.cc
gtk2_ardour/utils.cc
gtk2_ardour/video_server_dialog.cc
libs/ardour/ardour/session.h
libs/ardour/audio_unit.cc
libs/ardour/audiosource.cc
libs/ardour/ladspa_plugin.cc
libs/ardour/lv2_plugin.cc
libs/ardour/midi_track.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_midi.cc
libs/ardour/wscript
libs/pbd/pbd/ringbuffer.h