samcake f179b0e9ca Merge remote-tracking branch 'origin/master' into 19734 ... Conflicts: cmake/modules/FindLeapMotion.cmake interface/CMakeLists.txt interface/src/devices/Leapmotion.h		2014-07-08 12:43:32 -07:00
..
external	Merge remote-tracking branch 'origin/master' into 19734	2014-07-08 12:43:32 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 13:12:37 -07:00
src	Improve the LeapMotion support	2014-07-08 11:37:11 -07:00
ui	Merge pull request #3108 from huffman/19800	2014-07-02 15:46:56 -07:00
CMakeLists.txt	Merge remote-tracking branch 'origin/master' into 19734	2014-07-08 12:43:32 -07:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in