Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 01:26:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/avatars
History
Andrzej Kapolka f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
2013-07-05 22:52:42 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-05 22:52:42 -07:00
CMakeLists.txt fixed build issue 2013-06-04 17:40:34 -07:00