Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:15:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
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
..
audio Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
avatars Removed remaining Orientation bits (and class itself), enforce limits on 2013-05-30 15:15:12 -07:00
shared copy and paste working 2013-06-03 18:08:11 -07:00
voxels Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-04 11:00:59 -07:00