overte/libraries/entities
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 cleanup some warnings 2015-07-15 11:20:55 -07:00