Seth Alves 3bbecf5c8b Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room		2016-02-02 10:04:35 -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 #6991 from seefo/master	2016-02-02 08:22:45 -08:00
src	Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room	2016-02-02 10:04:35 -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