Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 03:10:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/domain-server
History
ZappoMan 027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
..
resources/web have the domain-server brand in navbar link back to home 2014-08-04 16:23:28 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 14:26:56 -07:00
CMakeLists.txt library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00