merge and resolve conflict with master
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Nov 2013 03:29:25 +0000 (22:29 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Nov 2013 03:29:25 +0000 (22:29 -0500)
commit15cee60021eada542b2dae0fafbb3150fcaa5010
tree5fc73ceb1c5136b7051292ea938bf6c2eb55aff6
parentd63e8ba0e8eeda4f53684bbd20f027c0cd6f7c89
parentd1cc7e5a50e2144d7aea01bc5eceed6657513c1b
merge and resolve conflict with master
gtk2_ardour/wscript