Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 08:19:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/entities
History
ZappoMan 19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
2015-04-22 09:35:08 -07:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 2015-04-22 09:35:08 -07:00
CMakeLists.txt bump shape stuff from ModelEntityItem down to RenderableModelEntityItem 2015-03-17 18:55:13 -07:00