Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Jan 2014 21:08:52 +0000 (16:08 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Jan 2014 21:08:52 +0000 (16:08 -0500)
commit2ba58dfe65bb0c5ba7d5eb18a1566fa79eeb6993
tree968712f0facbcc10e969b4835f1fa1a47d7bf6fe
parentd00dc6a706d769280e1ede340f58acb78ddc0ae6
parent66d02411182bec7871a6cb53e4476042f31f72c0
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
gtk2_ardour/panner_ui.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/sfdb_ui.cc
libs/ardour/plugin_manager.cc