Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/entities
History
ZappoMan cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
2014-12-03 15:07:47 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 15:07:47 -08:00
CMakeLists.txt move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00