overte/tests
Andrew Meadows 9b7e50858a merge upstream/master into andrew/inertia
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
..
audio rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
jitter rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
metavoxels rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
networking rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
octree merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
physics merge upstream/master into andrew/inertia 2014-12-29 09:15:49 -08:00
shared rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
CMakeLists.txt the command: 2014-09-03 16:34:23 +02:00