⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision fc0f8fb0
Added by
skyjake
over 4 years
ago
ID
fc0f8fb09b5fc0e1d2be9f030c22a962cfe7aa3b
Parent
ee23c88e
,
f9f85da5
Child
9f58782b
Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega
Conflicts:
doomsday/apps/client/include/client/clientsubsector.h
doomsday/apps/client/src/clientapp.cpp
doomsday/apps/client/src/render/fx/ramp.cpp
doomsday/apps/client/src/render/modelloader.cpp
doomsday/apps/client/src/world/subsector.cpp
doomsday/libs/core/include/de/legacy/str.hh
doomsday/libs/core/src/core/app.cpp
doomsday/libs/doomsday/src/doomsdayapp_bindings.cpp
doomsday/libs/gamekit/libs/common/src/common.cpp
doomsday/libs/gamekit/libs/common/src/game/gamerules.cpp
doomsday/libs/gamekit/libs/heretic/src/intermission.cpp
doomsday/libs/gamekit/libs/hexen/include/h2def.h
doomsday/libs/gui/include/de/graphics/glinfo.h
doomsday/sdk/libgui/CMakeLists.txt
doomsday/sdk/libgui/src/graphics/glinfo.cpp
doomsday/sdk/liblegacy/CMakeLists.txt
Files
added
modified
copied
renamed
deleted
Loading...
Doomsday
Engine
2.3
⇣
Builds
Add-ons
Manual
·
Forums
Support
Bug
Tracker
Blog
Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega