From: Carl Hetherington Date: Tue, 29 Apr 2014 11:42:49 +0000 (+0100) Subject: Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas X-Git-Tag: 4.0-rc1~1601^2~1292 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=152935e736eaf06f85bc7f5cb27337a62d95edd4 Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas --- 152935e736eaf06f85bc7f5cb27337a62d95edd4