Andrew Meadows d5119b3532 merge upstream/master into andrew/bispinor ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/EntityMotionState.h libraries/physics/src/ObjectMotionState.cpp libraries/physics/src/PhysicsEngine.cpp libraries/physics/src/PhysicsEngine.h		2015-01-16 14:36:27 -08:00
..
FindATL.cmake
FindBullet.cmake	modify PATH_SUFFIXES when hunting for include dir	2015-01-16 13:38:11 -08:00
FindFaceshift.cmake
FindGLEW.cmake	fix indentation	2015-01-07 22:53:44 +01:00
FindGLM.cmake
FindGverb.cmake
FindLeapMotion.cmake
FindLibOVR.cmake
FindNSIGHT.cmake
FindOpenSSL.cmake
FindPrioVR.cmake
FindQt5LinguistToolsMacros.cmake
FindQxmpp.cmake
FindRSSDK.cmake
FindRtMidi.cmake
FindSDL2.cmake
FindSixense.cmake
FindTBB.cmake
FindVisage.cmake
MacOSXBundleInfo.plist.in