stojce 939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/src/Menu.h		2014-03-13 18:41:58 +01:00
..
external	Slight tweak to Visage instructions (in order not to overwrite our custom	2014-03-10 15:16:48 -07:00
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-13 18:41:58 +01:00
ui	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-13 18:41:58 +01:00
CMakeLists.txt	Changed the chat window to a popup with a custom closing button.	2014-03-13 04:07:33 +02:00
interface.icns
interface_en.ts	Hid the chat window rather than close it in order to preserve sent	2014-03-13 14:07:21 +02:00
InterfaceConfig.h.in
InterfaceVersion.h.in