Andrzej Kapolka 65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact ... Conflicts: interface/src/Application.cpp		2013-11-04 10:40:02 -08:00
..
external	begin to remove fervor + quazip	2013-09-26 17:39:33 -07:00
resources	fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel	2013-11-03 11:10:00 -08:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 321contact	2013-11-04 10:40:02 -08:00
CMakeLists.txt	fix missing link to starfield implementation files	2013-10-18 09:01:44 -07:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in