Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 15 Oct 2013 15:17:12 +0000 (11:17 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 15 Oct 2013 15:17:12 +0000 (11:17 -0400)
commit69a8fc43e2552d9d3c72f9117131ca6b9392093b
tree5801431cf70df2f7d4e9019977e2aa37c052be7f
parent2a6a16f980ff9181b138f7a30aedfbde4426a591
parentfb1eefdd5e0fb4bce89634aba61196263cc91979
Merge branch 'master' into windows
13 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/plugin_ui.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/wscript
libs/ardour/audioengine.cc
libs/ardour/route.cc
libs/ardour/test/test_common.cc
libs/ardour/test/test_common.h
libs/ardour/wscript
libs/backends/jack/jack_utils.cc
libs/surfaces/mackie/mackie_control_protocol.cc