overte-thingvellir/tests
Atlante45 327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -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 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-22 13:34:18 -08:00
networking rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
octree rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
physics rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -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