Thijs Wenker 80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 ... Conflicts: interface/src/Menu.cpp		2015-01-15 02:28:31 +01:00
..
faceshift
gverb	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
leapmotion
libovr
priovr
rssdk	rssdk instructions	2014-12-19 16:36:06 +01:00
rtmidi	Script updates and fixes to highfidelity-public	2015-01-06 17:04:42 -08:00
sdl2	Add instructions for building with SDL2	2015-01-11 11:44:16 -08:00
sixense
visage