Stephen Birarda 55d8b763c5 Merge branch 'master' of https://github.com/highfidelity/hifi		2014-07-02 09:42:32 -07:00
..
external	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -07:00
resources	Properly use body orientation for Oculus camera	2014-06-27 09:53:31 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 09:42:32 -07:00
ui	Merge pull request #3106 from ctrlaltdavid/19823	2014-07-02 09:06:01 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -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