Seth Alves 4c996885e5 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting		2015-12-18 17:15:29 -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	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 17:15:29 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00