Thijs Wenker 4c2c37acce Merge branch 'master' of https://github.com/worklist/hifi into 20724		2015-11-12 02:19:35 +01:00
..
external
i18n
icon
resources
src	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-12 02:19:35 +01:00
ui
CMakeLists.txt