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
..
FindATL.cmake	repairs to FindATL indenting	2014-10-24 11:12:55 -07:00
FindFaceshift.cmake
FindGLEW.cmake	fix indentation	2015-01-07 22:53:44 +01:00
FindGLM.cmake
FindGverb.cmake	typo	2014-10-22 13:40:58 -07:00
FindLeapMotion.cmake
FindLibOVR.cmake	Find Oculus libraries when using Visual Studio 2013	2014-12-01 10:40:37 -08:00
FindNSIGHT.cmake	Add NSIGHT Profiliing capability	2014-10-27 11:41:39 -07:00
FindOpenSSL.cmake
FindPrioVR.cmake
FindQt5LinguistToolsMacros.cmake
FindQxmpp.cmake
FindRSSDK.cmake	RealSense Initial	2014-12-13 23:04:19 +01:00
FindRtMidi.cmake
FindSDL2.cmake	Moved the new hints to HINTS, thanks for the hint @birarda	2014-10-21 13:39:24 +02:00
FindSixense.cmake
FindTBB.cmake	add lib to lib dirs for win and linux	2014-12-15 14:02:55 -08:00
FindVisage.cmake	temp disable visage to get to C++11 support	2014-12-17 16:41:28 -08:00
MacOSXBundleInfo.plist.in