Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 05:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/assignment-client
History
ZappoMan 2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
2014-07-15 10:04:40 -07:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:04:40 -07:00
CMakeLists.txt more Models->Entities renaming 2014-06-26 17:01:07 -07:00