⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision 1e97297b
Added by
skyjake
almost 4 years
ago
ID
1e97297ba16e9e50572f2da5f6f734bcb7fee988
Parent
f44a6b40
,
339b4104
Child
cc121d59
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into stable
Conflicts:
doomsday/apps/client/net.dengine.client.pack/Info
doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info
doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info
doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings
doomsday/apps/client/src/clientapp.cpp
doomsday/apps/client/src/render/modelrenderer.cpp
doomsday/apps/client/src/world/base/bindings_world.cpp
doomsday/apps/libdoomsday/net.dengine.base.pack/Info
doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp
doomsday/apps/libdoomsday/src/gameprofiles.cpp
doomsday/apps/plugins/common/src/common.cpp
doomsday/cmake/Macros.cmake
doomsday/cmake/Version.cmake
doomsday/sdk-qch.doxy
doomsday/sdk/libcore/net.dengine.stdlib.pack/Info
doomsday/sdk/libgui/net.dengine.stdlib.gui.pack/Info
doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings
Files
added
modified
copied
renamed
deleted
Loading...
Doomsday
Engine
2.3
⇣
Builds
Add-ons
Manual
·
Forums
Support
Bug
Tracker
Blog
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into stable