overte/libraries/physics
Andrew Meadows 6ea766b48d merge andrew/thermonuclear into andrew/inertia
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
2014-12-17 13:21:00 -08:00
..
src merge andrew/thermonuclear into andrew/inertia 2014-12-17 13:21:00 -08:00
CMakeLists.txt moving Shape* back into shared lib 2014-12-01 16:03:14 -08:00