Atlante45 80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers		2015-07-10 20:20:03 -07:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -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