Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 25 Nov 2013 14:26:35 +0000 (09:26 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 25 Nov 2013 14:26:35 +0000 (09:26 -0500)
commitfa22520fd257f166c00615e7e40ec10c9e29b948
tree7c4cb225fb66306001db6f60d01aecfcfd91d2ef
parent0cca2724311b8df9989dc46efad12bdbe05c3883
parentf1db14923e5d14331d1bf869d32862a2cf3460bb
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/route_time_axis.cc
libs/ardour/vst_plugin.cc
libs/ardour/wscript