mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 23:32:02 +00:00
f8e5a0ebf0
# Conflicts: # src/g_doomedmap.cpp # src/info.h # src/p_saveg.cpp # src/p_setup.cpp # src/p_spec.cpp # src/r_defs.h # wadsrc/static/mapinfo/eternity.txt # wadsrc/static/xlat/eternity.txt |
||
---|---|---|
.. | ||
base.txt | ||
defines.i | ||
doom.txt | ||
doom_base.txt | ||
eternity.txt | ||
heretic.txt | ||
heretic_base.txt | ||
strife.txt | ||
strife_base.txt |