Revision 5037f6ad - Merge branch 'master' into hud-cleanup Conflicts: doomsday/plugins/common/sr... - Doomsday Engine - Tracker

« Previous | Next »

Revision 5037f6ad

Added by danij over 9 years ago

ID 5037f6ad222b7c0e5d7557883635fbdf16a0b97b
Parent d877405b, 94904e42
Child c10e3cf5

Merge branch 'master' into hud-cleanup

Conflicts:
doomsday/plugins/common/src/mapstatereader.cpp
doomsday/plugins/hexen/src/m_cheat.cpp
doomsday/plugins/hexen/src/p_inter.c

Files

added
modified
copied
renamed
deleted