Andrew Meadows fff7a36b54 merge upstream/master into physics project ... Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/renderer/Model.h		2014-03-25 15:55:26 -07: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 upstream/master into physics project	2014-03-25 15:55:26 -07: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	merge upstream/master into physics project	2014-03-25 15:55:26 -07:00
InterfaceConfig.h.in
InterfaceVersion.h.in