Andrew Meadows 661a916ebd merge rig into cleanup (removal of legacy shapes) ... Conflicts: interface/src/avatar/Avatar.h tests/physics/src/ShapeColliderTests.cpp tests/physics/src/ShapeColliderTests.h		2015-07-31 13:40:51 -07:00
..
src	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -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