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)
commitf4b5f4c72ee60b6f509e307c5bfd164108d1f30b
tree20b83f84fc836b7bcc0ca218a9f0116147a4a1e5
parent2a7ed69c28c5c4606ff13b3605b9bc9c3eba607d
parent3566fa2d8ef069805c70e39101a129c35419ded7
Merge branch 'master' into cairocanvas
libs/ardour/plugin_manager.cc