Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 00:38:17 +0000 (20:38 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 00:38:17 +0000 (20:38 -0400)
commit6b78532dd5a75e2d13dba2b1fd07f099dde706a8
tree572859d9042c311d211d8b419d279b58323b7902
parentc1df3295c179b040a1d703d610e0f5a8b8dedb37
parent5cac4a6885f38b9ecd211b39cef6593da853cee4
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas