Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorunknown <Ben>
Fri, 18 Apr 2014 14:35:49 +0000 (09:35 -0500)
committerunknown <Ben>
Fri, 18 Apr 2014 14:35:49 +0000 (09:35 -0500)
commit855fb705eac9f35e026e3c68bebd9191c6948aa6
tree3194bbfbb1959527268c81bf0413467024fb4682
parent1cd406bc97350db09dffe430b24b4a12f65faf11
parentf108b40d53acde00d9a2df9540ae2b58c170c9fb
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas