Ryan Huffman b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole		2015-12-10 14:36:03 -08:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n
icon
resources	Prototyping threaded present	2015-12-04 10:28:16 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole	2015-12-10 14:36:03 -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