Andrzej Kapolka 60e8971eb9 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/main.cpp		2013-05-14 11:29:08 -07:00
..
external	remove the source files from the LibOVR dir	2013-05-10 14:29:33 -07:00
resources	remove old style walking sounds	2013-05-10 17:21:58 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-14 11:29:08 -07:00
CMakeLists.txt	Massive migration from GLUT/globals to Qt/class members. Mostly there.	2013-05-13 21:11:54 -07:00
Interface.icns	include the icon file referenced in last commit	2013-02-15 13:01:00 -08:00
InterfaceConfig.h.in	add header for glut to conditional include in InterfaceConfig	2013-02-08 14:57:59 -08:00