Conflicts: src/actor.h src/g_doom/a_doomweaps.cpp src/p_local.h src/p_map.cpp src/sdl/i_main.cpp src/thingdef/thingdef_codeptr.cpp |
||
|---|---|---|
| .. | ||
| chex | ||
| doom | ||
| heretic | ||
| hexen | ||
| raven | ||
| shared | ||
| strife | ||
| actor.txt | ||
| constants.txt | ||
Conflicts: src/actor.h src/g_doom/a_doomweaps.cpp src/p_local.h src/p_map.cpp src/sdl/i_main.cpp src/thingdef/thingdef_codeptr.cpp |
||
|---|---|---|
| .. | ||
| chex | ||
| doom | ||
| heretic | ||
| hexen | ||
| raven | ||
| shared | ||
| strife | ||
| actor.txt | ||
| constants.txt | ||