Revision cd502f73 - Merge branch 'master' into common-episode-definition Conflicts: doomsday/plu... - Doomsday Engine - Tracker

« Previous | Next »

Revision cd502f73

Added by danij almost 10 years ago

ID cd502f7332515f284fe7002f96ee23ee96d74f78
Parent e300eb5c, acc208a9
Child 62c4b729

Merge branch 'master' into common-episode-definition

Conflicts:
doomsday/plugins/common/src/p_mapsetup.cpp
doomsday/plugins/common/src/p_xgline.cpp

Files

added
modified
copied
renamed
deleted