Merge branch 'master' into common-episode-definition
Conflicts:doomsday/api/api_map.hdoomsday/api/dd_share.hdoomsday/client/src/render/viewports.cppdoomsday/client/src/world/api_map.cpp
Added by danij about 10 years ago
Added by
Merge branch 'master' into common-episode-definition
Conflicts:
doomsday/api/api_map.h
doomsday/api/dd_share.h
doomsday/client/src/render/viewports.cpp
doomsday/client/src/world/api_map.cpp