Seth Alves 9e5116bf4f Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting		2015-12-16 15:56:31 -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 simulating mouse/reticle behavior with input contorllers	2015-12-15 13:59:22 -08:00
src	Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-16 15:56:31 -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