Conflicts: src/CMakeLists.txt src/actor.h src/g_heretic/a_hereticmisc.cpp src/g_heretic/a_hereticweaps.cpp src/g_heretic/a_ironlich.cpp src/info.h src/namedef.h src/p_buildmap.cpp src/p_enemy.cpp src/p_map.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp zdoom.vcproj |
||
|---|---|---|
| .. | ||
| fixrtext | ||
| lemon | ||
| re2c | ||
| updaterevision | ||
| zipdir | ||
| CMakeLists.txt | ||