Howard Stearns d51785a259 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate		2015-12-03 17:28:32 -08:00
..
external	Moving SDL2, Sixense and Faceshift to external projects	2015-10-30 00:57:51 -07:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	change hydra secondary thumb to 0 button	2015-12-03 09:06:18 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate	2015-12-03 17:28:32 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Fix for linker warning LNK4075 on Windows	2015-11-27 20:56:57 -08:00