Merge branch 'noppc' of https://github.com/mojofunk/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 19 May 2014 21:45:01 +0000 (17:45 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 19 May 2014 21:45:01 +0000 (17:45 -0400)
1  2 
wscript

diff --cc wscript
Simple merge