Howard Stearns d964032572 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc		2015-12-09 15:23:00 -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	Prototyping threaded present	2015-12-04 10:28:16 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-09 15:23:00 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Fix	2015-12-08 14:20:19 -08:00