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
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities-renderer	Merge pull request #3989 from birarda/master	2014-12-21 11:34:43 -08:00
fbx	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
gpu	Merge pull request #3992 from samcake/temp0	2014-12-22 10:12:48 -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	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
physics	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2014-12-22 13:34:18 -08:00
voxels	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00