Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:07:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries/avatars
History
Atlante45 c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
2015-01-27 15:04:17 -08:00
..
src Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 15:04:17 -08:00
CMakeLists.txt Remove avatars dependency on model,gpu,fbx (OpenGL) 2015-01-23 12:14:13 -08:00