mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-13 16:07:40 +00:00
f7834061df
Conflicts: src/dobjtype.cpp src/p_conversation.cpp src/p_local.h src/p_things.cpp src/thingdef/thingdef_properties.cpp (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible) |
||
---|---|---|
.. | ||
chex | ||
doom | ||
heretic | ||
hexen | ||
raven | ||
shared | ||
strife | ||
actor.txt | ||
constants.txt |