Andrzej Kapolka 865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone ... Conflicts: interface/src/Audio.cpp interface/src/Menu.cpp interface/src/avatar/Avatar.h interface/src/avatar/MyAvatar.cpp interface/src/devices/Webcam.cpp interface/src/devices/Webcam.h interface/src/renderer/FBXReader.cpp		2014-01-16 13:35:03 -08:00
..
faceshift	make faceshift compile sources on windows to address linker error	2014-01-14 10:20:27 -08:00
freeglut	added latest version of freeglut for windows	2014-01-13 14:46:03 -08:00
glew	adding glew external for windows build	2014-01-14 19:16:15 -08:00
glut	move windowshacks	2014-01-12 21:46:55 -08:00
LibOVR	Mac library with RTTI enabled, prevent crash on startup when there's no	2013-11-25 18:36:23 -08:00
MotionDriver	Recompiled OS X driver.	2013-08-07 18:40:52 -07:00
pthreads	more windows build work	2014-01-13 15:57:31 -08:00
Sixense	Path fix for readme.	2013-11-18 12:34:38 -08:00