Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:53:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/shared
History
Andrew Meadows f093a571c5 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/shared/src/CollisionInfo.h
2014-01-29 14:12:22 -08:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-29 14:12:22 -08:00
CMakeLists.txt remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00