Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 11 Jul 2014 13:59:59 +0000 (09:59 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 11 Jul 2014 13:59:59 +0000 (09:59 -0400)
commit6990c31ed52c1c2491c19fc68c402acb4abc10e8
treea2a2d6ab088ee5341a023bade9dfbf19cbe7e139
parent7464b3f9fab1398d93a486e8d4c5469f9b8f7fcb
parent15de7aa4337440de2ab874fd2d8cc906c8445e7a
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas