Andrzej Kapolka e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected ... Conflicts: interface/src/Avatar.cpp		2013-07-03 10:15:11 -07:00
..
FindFreenect.cmake	Lots of Kinect bits.	2013-06-25 14:27:13 -07:00
FindGLM.cmake	don't go looking for GLM twice, check the cache	2013-05-21 15:01:41 -07:00
FindJack.cmake	moved stuff around to migrate glm to shared	2013-04-11 18:41:12 -07:00
FindLeap.cmake	don't link a NOTFOUND leap library	2013-07-02 15:27:30 -07:00
FindLibOVR.cmake	conditional repairs for custom modules	2013-05-14 12:02:54 -07:00
FindLibrt.cmake	moved stuff around to migrate glm to shared	2013-04-11 18:41:12 -07:00
FindLibUSB.cmake	Lots of Kinect bits.	2013-06-25 14:27:13 -07:00
FindOpenCV.cmake	Working on reintegrating OpenCV (also, removed lodepng).	2013-06-17 13:24:01 -07:00
FindOpenNI.cmake	Build OpenNI/NITE into interface if available.	2013-06-28 16:47:08 -07:00
FindPortAudio.cmake	conditional repairs for custom modules	2013-05-14 12:02:54 -07:00
FindQuazip.cmake	add the quazip library and a find module	2013-06-25 16:44:11 -07:00
FindSTK.cmake	add the STK library for future audio magic	2013-05-30 12:25:29 -07:00
FindUVCCameraControl.cmake	Use a CMake module for UVCCameraControl.	2013-06-19 11:14:32 -07:00