Andrzej Kapolka 591cf98821 Merge branch 'master' of https://github.com/worklist/hifi into ossome ... Conflicts: interface/src/renderer/FBXReader.cpp		2013-10-18 14:30:50 -07:00
..
external	begin to remove fervor + quazip	2013-09-26 17:39:33 -07:00
resources	Removed unused shader.	2013-10-15 17:14:20 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into ossome	2013-10-18 14:30:50 -07:00
CMakeLists.txt	fix missing link to starfield implementation files	2013-10-18 09:01:44 -07:00
interface.icns
InterfaceConfig.h.in