Lucas Crisman 793179dc72 Merge branch 'master' of git://github.com/worklist/hifi into 19498 ... Conflicts: interface/src/Application.cpp		2014-04-03 16:24:32 -03:00
..
external	slightly different approach to windows warning fix	2014-03-15 21:30:45 -07:00
resources	Manual merge	2014-04-02 18:07:55 -07:00
src	Merge branch 'master' of git://github.com/worklist/hifi into 19498	2014-04-03 16:24:32 -03:00
ui	Manual merge	2014-04-02 18:07:55 -07:00
CMakeLists.txt	more cleanup	2014-03-22 20:42:34 -07:00
interface.icns
interface_en.ts	Informed users who want to chat they have to log in first.	2014-04-03 20:09:54 +03:00
InterfaceConfig.h.in
InterfaceVersion.h.in