David Rowe 02ae008c9c Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt		2015-07-29 16:24:30 -07:00
..
connexionclient	The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351	2015-07-27 19:04:49 +02:00
faceshift
iViewHMD	Add SMI iViewHMD eye tracking as an optional library	2015-07-27 14:43:32 -07:00
leapmotion
rssdk
rtmidi
sdl2
sixense