fix merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Nov 2013 03:31:29 +0000 (22:31 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Nov 2013 03:31:29 +0000 (22:31 -0500)
commit3c98de9ce4bf6754a10710cfcd4400b5ebaaaa88
tree4679c4f5f9b8afc16f050f6587d9b18f49b715ea
parent680c64246e4ee9f3eb53da079dea6a7ecf996e92
parentd1cc7e5a50e2144d7aea01bc5eceed6657513c1b
fix merge with master
gtk2_ardour/wscript
libs/backends/jack/jack_audiobackend.cc