Project

General

Profile

« Previous | Next » 

Revision 603d525e

Added by skyjake almost 4 years ago

Merge branch 'work/omega'

  1. Conflicts:
  2. doomsday/apps/client/src/dd_loop.cpp
  3. doomsday/apps/client/src/def_main.cpp
  4. doomsday/apps/client/src/ui/clientwindowsystem.cpp
  5. doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp
  6. doomsday/apps/client/src/world/base/clientserverworld.cpp
  7. doomsday/cmake/Macros.cmake
  8. doomsday/cmake/PlatformMacx.cmake
  9. doomsday/cmake/Version.cmake
  10. doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
  11. doomsday/libs/doomsday/src/defs/mapinfo.cpp
  12. doomsday/libs/doomsday/src/world/bindings.cpp
  13. doomsday/libs/gamekit/libs/common/src/common.cpp
  14. doomsday/libs/gamekit/libs/common/src/world/p_mapsetup.cpp
  15. doomsday/libs/gamekit/libs/heretic/src/h_api.cpp
  16. doomsday/libs/gamekit/libs/heretic/src/h_main.cpp
  17. doomsday/libs/gamekit/libs/heretic/src/p_spec.cpp
  18. doomsday/libs/gui/net.dengine.stdlib.gui.pack/modules/gui.ds

Files

  • added
  • modified
  • copied
  • renamed
  • deleted