stojce 6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts		2014-03-14 21:05:30 +01:00
..
external
resources	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-13 18:41:58 +01:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-14 21:05:30 +01:00
ui	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-14 21:05:30 +01:00
CMakeLists.txt	Fixes for Linux build.	2014-03-13 10:56:19 -07:00
interface.icns
interface_en.ts	New layout	2014-03-14 01:51:22 +01:00
InterfaceConfig.h.in
InterfaceVersion.h.in