Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 26 Nov 2013 15:25:55 +0000 (10:25 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 26 Nov 2013 15:25:55 +0000 (10:25 -0500)
commitefff843f0537df84e22af5f6f6e8e6d6a305a5a9
tree0a4f28013a67c9f509234ba1619ac48e5b19b118
parent08371ae2cf6231bbb8522645d14add41ffa9c1c0
parentf1db14923e5d14331d1bf869d32862a2cf3460bb
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/export_dialog.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/route_time_axis.cc
libs/ardour/lv2_plugin.cc