Thijs Wenker a97524f954 Merge branch 'master' of https://github.com/worklist/hifi into 20638		2015-08-12 15:26:53 +02:00
..
external	trying to fix connexion linker errors, general style fixes, renamed some files	2015-08-01 11:41:29 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Cleanup and PR comments	2015-08-08 13:54:37 -07:00
src	Merge pull request #5402 from highfidelity/plugins	2015-08-11 11:11:27 -07:00
ui	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-12 15:26:53 +02:00
interface_en.ts
InterfaceVersion.h.in