Paul Davis fb45fdc052 fix conflicts and merge with master

2013-09-16 22:11:06 -04:00

..

jack

fix conflicts and merge with master

2013-09-16 22:11:06 -04: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