Andrzej Kapolka c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: avatar-mixer/src/main.cpp		2013-04-25 17:40:55 -07:00
..
external	more moving around of things	2013-04-11 18:56:46 -07:00
resources	move stars.txt to S3 bucket	2013-04-03 15:24:26 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-25 17:40:55 -07:00
CMakeLists.txt	complete an initial version of eve that sits at 0,0,0	2013-04-22 13:10:21 -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