Seth Alves 1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube		2016-01-26 13:31:07 -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	Fix overlay message dialog	2016-01-25 13:30:05 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube	2016-01-26 13:31:07 -08:00
ui	Killing the old preferences dialog	2016-01-22 19:24:38 -08:00
CMakeLists.txt	fixing accidental commit of leap motion disabling.	2016-01-22 20:27:23 -08:00