⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision 603d525e
Added by
skyjake
almost 4 years
ago
ID
603d525e4fbd775edf21fd4896a9efa3082ece13
Parent
9b9f3aa6
,
1dacc451
Child
bc14d4b1
Merge branch 'work/omega'
Conflicts:
doomsday/apps/client/src/dd_loop.cpp
doomsday/apps/client/src/def_main.cpp
doomsday/apps/client/src/ui/clientwindowsystem.cpp
doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp
doomsday/apps/client/src/world/base/clientserverworld.cpp
doomsday/cmake/Macros.cmake
doomsday/cmake/PlatformMacx.cmake
doomsday/cmake/Version.cmake
doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
doomsday/libs/doomsday/src/defs/mapinfo.cpp
doomsday/libs/doomsday/src/world/bindings.cpp
doomsday/libs/gamekit/libs/common/src/common.cpp
doomsday/libs/gamekit/libs/common/src/world/p_mapsetup.cpp
doomsday/libs/gamekit/libs/heretic/src/h_api.cpp
doomsday/libs/gamekit/libs/heretic/src/h_main.cpp
doomsday/libs/gamekit/libs/heretic/src/p_spec.cpp
doomsday/libs/gui/net.dengine.stdlib.gui.pack/modules/gui.ds
Files
added
modified
copied
renamed
deleted
Loading...
Doomsday
Engine
2.3
⇣
Builds
Add-ons
Manual
·
Forums
Support
Bug
Tracker
Blog
Merge branch 'work/omega'