Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/libraries/avatars
History
Brad Hefta-Gaub 392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
2014-01-13 15:06:26 -08:00
..
src Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:06:26 -08:00
CMakeLists.txt first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00