ZappoMan 32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: assignment-client/CMakeLists.txt interface/CMakeLists.txt libraries/entities/CMakeLists.txt libraries/models/src/ModelEditPacketSender.cpp libraries/models/src/ModelEditPacketSender.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h libraries/octree/src/OctreePacketData.h libraries/octree/src/OctreeQuery.cpp libraries/particles/src/ParticleEditPacketSender.cpp libraries/particles/src/ParticleEditPacketSender.h libraries/script-engine/CMakeLists.txt tests/octree/CMakeLists.txt		2014-08-18 15:16:35 -07:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-18 15:16:35 -07:00
CMakeLists.txt	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00