overte-HifiExperiments/libraries/shared
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 remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00