Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorCarl Hetherington <cth@carlh.net>
Tue, 29 Apr 2014 11:42:49 +0000 (12:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 29 Apr 2014 11:42:49 +0000 (12:42 +0100)
commit152935e736eaf06f85bc7f5cb27337a62d95edd4
treeb80a9d2c65d8bfbfbf471b329ace51089180d0e5
parente36f74e071d4c14862d23da5ff0d49df0940d536
parent1f70e9472a81303a9ec4ceca177fab57105f8167
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas