Thijs Wenker 953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation ... Conflicts: interface/src/Application.cpp interface/src/scripting/HMDScriptingInterface.h libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h		2015-10-06 20:06:29 +02:00
..
external	Update readme.txt	2015-09-15 00:29:12 +02:00
i18n	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
icon
resources	Merge pull request #5974 from Atlante45/extra_debug	2015-10-01 14:42:45 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation	2015-10-06 20:06:29 +02:00
ui	Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec.	2015-09-21 10:26:04 -07:00
CMakeLists.txt	add GLEW_STATIC to fix link warnings	2015-10-02 15:08:04 -07:00