Stephen Birarda 1fd4a1f0c3 resolve conflicts on merge with upstream master		2015-07-17 16:07:45 -07:00
..
src	resolve conflicts on merge with upstream master	2015-07-17 16:07:45 -07:00
CMakeLists.txt	Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.	2015-06-19 14:20:00 -07:00