Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 8 Feb 2014 16:18:17 +0000 (11:18 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 8 Feb 2014 16:18:17 +0000 (11:18 -0500)
1  2 
libs/ardour/plugin_manager.cc

Simple merge