Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 19:23:01 +0000 (15:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 19:23:01 +0000 (15:23 -0400)
commit3737f346eeabb32de828172c851933c698bef5a6
treeb87bbbb5a5d1a8200a7de159a87df4305caa1b37
parentec102f94e1105a6c9f445a0cde6c2dd1b6ea4b8b
parent8f2a2877b52894349f2f5f9315c5bf7498de4b02
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas