Lucas Crisman 8ed30d9da2 Merge branch 'master' of git://github.com/worklist/hifi into 19498 ... Conflicts: interface/src/Application.cpp		2014-03-25 14:43:40 -03:00
..
external	slightly different approach to windows warning fix	2014-03-15 21:30:45 -07:00
resources	Don't use textures/fancy shaders when rendering shadow map. Closes #2270.	2014-03-24 13:15:03 -07:00
src	Merge branch 'master' of git://github.com/worklist/hifi into 19498	2014-03-25 14:43:40 -03:00
ui	Moved the chat from a window to a built-in panel.	2014-03-14 01:12:25 +02:00
CMakeLists.txt	more cleanup	2014-03-22 20:42:34 -07:00
interface.icns
interface_en.ts	Yeesh, another translation update.	2014-03-24 15:11:14 -07:00
InterfaceConfig.h.in
InterfaceVersion.h.in