Anthony J. Thibault d743ea2c9b Changed urls from s3-us-west-1 to hifi-content.s3		2016-01-28 14:20:10 -08:00
..
external
i18n
icon
resources	Changed urls from s3-us-west-1 to hifi-content.s3	2016-01-28 14:20:10 -08:00
src	Merge pull request #6930 from zzmp/feat/bubble-render-settings	2016-01-27 14:20:51 -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