Leonardo Murillo 2ac42d9a2b Merge branch 'master' of https://github.com/highfidelity/hifi		2015-12-28 18:37:19 -06:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	Fixing authentication token for followed links	2015-12-21 15:44:35 -08:00
src	Move final blit into RenderDeferredTask	2015-12-23 18:21:08 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-19 18:44:21 -06:00