samcake 31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red		2016-02-11 10:05:58 -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	Merge pull request #7060 from jherico/qml	2016-02-10 11:39:45 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-11 10:05:58 -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