Merge branch 'master--optional-external-libs' of https://github.com/nphilipp/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 28 Oct 2013 12:54:29 +0000 (08:54 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 28 Oct 2013 12:54:29 +0000 (08:54 -0400)
1  2 
wscript

diff --cc wscript
Simple merge