Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 01:23:55 +0000 (21:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 01:23:55 +0000 (21:23 -0400)
commit6a4cddbc4c645fd0d49d60b854b1773b32026770
treeb45c7dee16f8886b4ea72adf19f85ddad6d7b9b2
parent381d4debf4c84816d08ff4de27bc9ae8d5d15f28
parent930fce869604dc2ebd03a1510924c7ab3cda8792
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas