samcake 3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster		2015-12-14 17:38:56 -08: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	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Trying to fix build problem	2015-12-10 12:00:40 -08:00