Brad Hefta-Gaub 1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback ... Removed json callback		2014-07-02 21:45:19 -07:00
..
external	Updated readme.txt	2014-06-30 12:42:43 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 13:12:37 -07:00
src	Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback	2014-07-02 21:45:19 -07:00
ui	Merge pull request #3108 from huffman/19800	2014-07-02 15:46:56 -07:00
CMakeLists.txt	Fixed CMake for oculus. Gave Oculus its own camera for minimum latency.	2014-06-26 17:10:53 -07:00
interface.icns
interface_en.ts	Merge branch master	2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00