ZappoMan 77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h		2014-07-31 10:34:23 -07:00
..
src	more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe	2014-07-10 13:42:49 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-31 10:34:23 -07:00