Seth Alves 13ad6bf2f7 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting		2015-12-18 14:52:02 -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	Improved idle to walk forward transition	2015-12-15 17:26:17 -08:00
src	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 13:43:33 -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