mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 20:21:26 +00:00
0474560ac6
Conflicts: src/d_main.cpp src/info.cpp src/p_local.h (Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff. |
||
|---|---|---|
| .. | ||
| acs | ||
| actors | ||
| graphics | ||
| maparrows | ||
| mapinfo | ||
| sbarinfo | ||
| shaders/d3d | ||
| sounds | ||
| sprites | ||
| textures | ||
| xlat | ||
| althudcf.txt | ||
| animated.lmp | ||
| animdefs.txt | ||
| compatibility.txt | ||
| confont.lmp | ||
| dbigfont.lmp | ||
| decaldef.txt | ||
| decorate.txt | ||
| dehsupp.txt | ||
| etc.h.txt | ||
| fontdefs.txt | ||
| in_epi1.txt | ||
| in_epi2.txt | ||
| in_epi3.txt | ||
| in_htc1.txt | ||
| in_htc2.txt | ||
| in_htc3.txt | ||
| indexfont | ||
| iwadinfo.txt | ||
| language.enu | ||
| language.fr | ||
| language.ita | ||
| language.ptb | ||
| lockdefs.txt | ||
| menudef.txt | ||
| netnotch.dat | ||
| notch.dat | ||
| reverbs.txt | ||
| sbarinfo.txt | ||
| sbigfont.lmp | ||
| sndinfo.txt | ||
| sndseq.txt | ||
| spaldoom.lmp | ||
| spalhtic.lmp | ||
| teaminfo.txt | ||
| terrain.txt | ||
| textcolors.txt | ||
| textures.txt | ||
| things.h.txt | ||
| vga-rom-font.16 | ||
| x11r6rgb.txt | ||
| xhairs.txt | ||