Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 18:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/assignment-client
History
ZappoMan 865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 2014-07-01 16:32:47 -07:00
CMakeLists.txt more Models->Entities renaming 2014-06-26 17:01:07 -07:00