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
..
external	link PortAudio as a static library instead of compiling as dependency	2013-05-14 11:22:34 -07:00
resources	Merge branch 'master' of https://github.com/worklist/hifi into voxeltars	2013-06-04 11:00:59 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into voxeltars	2013-06-04 11:00:59 -07:00
CMakeLists.txt	More work on voxeltars; separated default pose from bind pose.	2013-06-04 10:22:58 -07:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in	add header for glut to conditional include in InterfaceConfig	2013-02-08 14:57:59 -08:00