overte/interface
barnold1953 2eda35ff1d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
..
external Better instructions. 2014-05-12 17:55:07 -07:00
resources New reticle for sixense and oculus mouse movement 2014-06-13 15:03:09 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-17 12:25:09 -07:00
ui Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
CMakeLists.txt put back ssize_t definition 2014-05-20 11:56:06 -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