Andrew Meadows 8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) ... Conflicts: interface/src/Application.cpp		2014-07-14 09:10:27 -07:00
..
faceplus
faceshift
leapmotion	Final cleaning, ready to publish	2014-07-09 01:02:56 -07:00
oculus	Updated oculus readme.txt for windows users	2014-07-01 12:33:54 -07:00
priovr
rtmidi	updates to RtMidi find module to look for static or dynamic lib	2014-07-08 12:06:43 -07:00
sixense
visage