qzdoom/wadsrc/static
Christoph Oelckers 70d87f94f2 Merge branch 'master' into floatcvt
# Conflicts:
#	src/p_acs.cpp
#	src/r_utility.cpp
#	src/thingdef/thingdef_codeptr.cpp
#	src/version.h
2016-03-23 14:15:24 +01:00
..
actors Merge branch 'master' into floatcvt 2016-03-23 14:15:24 +01:00
filter
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
defbinds.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.eng
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