Howard Stearns 289c8d6137 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc		2015-12-07 11:54:33 -08:00
..
external
i18n
icon
resources
src	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 11:54:33 -08:00
ui
CMakeLists.txt