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
..
src	Moved LimitedNodeList into DM	2014-12-18 10:32:34 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00