Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:27 +0000 (16:12 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:27 +0000 (16:12 -0400)
commit81506ea41c40ed9ce6a433550549e0e25f0fe1a3
tree6f5a41b8544a1fdccbcaad5afc561a2549364e3f
parent30968b854257cb5f9159ca59589f783c85615601
parent6830d83236ae047eb077802cdb54eff5492928d3
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas