tosh 72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 ... Conflicts: interface/CMakeLists.txt		2013-06-20 03:46:25 +02:00
..
glut
LibOVR	remove the source files from the LibOVR dir	2013-05-10 14:29:33 -07:00
OpenCV	Working on reintegrating OpenCV (also, removed lodepng).	2013-06-17 13:24:01 -07:00
PortAudio	link PortAudio as a static library instead of compiling as dependency	2013-05-14 11:22:34 -07:00
Speex	- separates audio system round trip time determination from echo cancellation	2013-06-20 02:00:12 +02:00
UVCCameraControl	If we're going to take the parameters, we should probably apply them.	2013-06-19 11:32:52 -07:00