Howard Stearns b506fe0f1d Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound		2015-06-19 14:22:04 -07:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound	2015-06-19 14:22:04 -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