Atlante45 424afaa36b Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels ... Conflicts: interface/interface_en.ts		2014-03-12 15:59:17 -07:00
..
external	Slight tweak to Visage instructions (in order not to overwrite our custom	2014-03-10 15:16:48 -07:00
resources	Applied Ryan's tweaks to Visage mapping and config file.	2014-03-10 15:13:24 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels	2014-03-12 15:59:17 -07:00
ui	Changed the font used in the chat to Helvetica, with Arial as a	2014-03-12 23:45:10 +02:00
CMakeLists.txt	Patched the Qt CMake function for auto-translations so that *.ts files	2014-03-12 01:24:31 +02:00
interface.icns
interface_en.ts	Changed the font used in the chat to Helvetica, with Arial as a	2014-03-12 23:45:10 +02:00
InterfaceConfig.h.in
InterfaceVersion.h.in