fix merge conflicts from master
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 24 Aug 2013 16:18:06 +0000 (12:18 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 24 Aug 2013 16:18:06 +0000 (12:18 -0400)
commitee1b49f87e4b8e6406c059f29371892872d3fb85
tree107f163d9f707c97a0b8179a5f2afd9995d616ec
parent8cd71108c1d153f84f25c3b9e5153a110826c130
parent1421a34e52862b614f280c751a12893e4abecf88
fix merge conflicts from master
26 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/main.cc
gtk2_ardour/midi_tracer.cc
gtk2_ardour/port_matrix.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/transcode_ffmpeg.cc
gtk2_ardour/transcode_video_dialog.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/video_server_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/session.h
libs/ardour/audio_diskstream.cc
libs/ardour/butler.cc
libs/ardour/globals.cc
libs/ardour/lv2_plugin.cc
libs/ardour/midi_diskstream.cc
libs/ardour/midi_track.cc
libs/ardour/route.cc
libs/ardour/session_ltc.cc
libs/pbd/pbd/pthread_utils.h
libs/pbd/pthread_utils.cc
libs/pbd/wscript
wscript