gzdoom/wadsrc/static/actors/doom
Christoph Oelckers a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master'
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
2016-03-01 18:50:45 +01:00
..
arachnotron.txt Normalize line endings 2016-03-01 09:47:10 -06:00
archvile.txt Normalize line endings 2016-03-01 09:47:10 -06:00
bossbrain.txt Normalize line endings 2016-03-01 09:47:10 -06:00
bruiser.txt Normalize line endings 2016-03-01 09:47:10 -06:00
cacodemon.txt Normalize line endings 2016-03-01 09:47:10 -06:00
cyberdemon.txt Normalize line endings 2016-03-01 09:47:10 -06:00
deadthings.txt Normalize line endings 2016-03-01 09:47:10 -06:00
demon.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomammo.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomarmor.txt Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
doomartifacts.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomdecorations.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomhealth.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomimp.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomkeys.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doommisc.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomplayer.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doomweapons.txt Normalize line endings 2016-03-01 09:47:10 -06:00
fatso.txt Normalize line endings 2016-03-01 09:47:10 -06:00
keen.txt Normalize line endings 2016-03-01 09:47:10 -06:00
lostsoul.txt Normalize line endings 2016-03-01 09:47:10 -06:00
painelemental.txt Normalize line endings 2016-03-01 09:47:10 -06:00
possessed.txt Normalize line endings 2016-03-01 09:47:10 -06:00
revenant.txt Normalize line endings 2016-03-01 09:47:10 -06:00
scriptedmarine.txt Normalize line endings 2016-03-01 09:47:10 -06:00
spidermaster.txt Normalize line endings 2016-03-01 09:47:10 -06:00
stealthmonsters.txt Normalize line endings 2016-03-01 09:47:10 -06:00