Paul Davis 1676789907 fix merge conflicts from master

2013-12-12 10:06:59 -05:00

..

jack

fix merge conflicts from master

2013-12-12 10:06:59 -05:00

wscript

move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)

2013-09-07 11:03:57 -04:00