merge with master, fixing conflicts in 3 wscript files
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 9 Oct 2013 18:00:42 +0000 (14:00 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 9 Oct 2013 18:00:42 +0000 (14:00 -0400)
commit2a6a16f980ff9181b138f7a30aedfbde4426a591
treed86752508bbd033be18301796e7d0c571a4fe1c0
parent66aa6dfc8ecdb7591768bc45866a8c2b0d77e767
parent465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544
Merge ... master, fixing conflicts in 3 wscript files
24 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/main.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/plugin_selector.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/transcode_video_dialog.cc
gtk2_ardour/utils.cc
gtk2_ardour/video_monitor.cc
gtk2_ardour/wscript
libs/ardour/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/globals.cc
libs/ardour/graph.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/utils.cc
libs/ardour/wscript
libs/backends/jack/wscript
libs/gtkmm2ext/gtk_ui.cc
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
wscript