Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:49:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/avatars
History
Andrew Meadows fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
2014-03-25 15:55:26 -07:00
..
src merge upstream/master into physics project 2014-03-25 15:55:26 -07:00
CMakeLists.txt click harder 2014-03-08 18:22:30 -08:00