Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 12:00:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface/resources
History
Andrzej Kapolka d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
2013-06-04 11:00:59 -07:00
..
images change the iris texture 2013-05-17 10:51:29 -07:00
shaders Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-04 11:00:59 -07:00