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
leapmotion
libovr
priovr
rssdk
rtmidi
sdl2
sixense
visage