Ryan Huffman 89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message		2015-12-04 11:38:28 -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	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 proto-received-message	2015-12-04 11:38:28 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00