Stephen Birarda 02069bfcd2 Merge remote-tracking branch 'leo/master' into console		2016-01-04 09:57:55 -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	Merge branch 'master' into tony/neuron-plugin	2015-12-25 10:24:55 -08:00
src	Merge remote-tracking branch 'leo/master' into console	2016-01-04 09:57:55 -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 github.com:highfidelity/hifi	2015-12-31 09:06:44 -06:00