Project

General

Profile

« Previous | Next » 

Revision fc0f8fb0

Added by skyjake over 4 years ago

Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega

  1. Conflicts:
  2. doomsday/apps/client/include/client/clientsubsector.h
  3. doomsday/apps/client/src/clientapp.cpp
  4. doomsday/apps/client/src/render/fx/ramp.cpp
  5. doomsday/apps/client/src/render/modelloader.cpp
  6. doomsday/apps/client/src/world/subsector.cpp
  7. doomsday/libs/core/include/de/legacy/str.hh
  8. doomsday/libs/core/src/core/app.cpp
  9. doomsday/libs/doomsday/src/doomsdayapp_bindings.cpp
  10. doomsday/libs/gamekit/libs/common/src/common.cpp
  11. doomsday/libs/gamekit/libs/common/src/game/gamerules.cpp
  12. doomsday/libs/gamekit/libs/heretic/src/intermission.cpp
  13. doomsday/libs/gamekit/libs/hexen/include/h2def.h
  14. doomsday/libs/gui/include/de/graphics/glinfo.h
  15. doomsday/sdk/libgui/CMakeLists.txt
  16. doomsday/sdk/libgui/src/graphics/glinfo.cpp
  17. doomsday/sdk/liblegacy/CMakeLists.txt

Files

  • added
  • modified
  • copied
  • renamed
  • deleted