zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 13:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
qzdoom/wadsrc/static/xlat
History
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
..
base.txt Normalize line endings 2016-03-01 09:47:10 -06:00
defines.i Normalize line endings 2016-03-01 09:47:10 -06:00
doom.txt Normalize line endings 2016-03-01 09:47:10 -06:00
doom_base.txt Normalize line endings 2016-03-01 09:47:10 -06:00
eternity.txt Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e' 2016-03-01 17:23:35 +01:00
heretic.txt Normalize line endings 2016-03-01 09:47:10 -06:00
heretic_base.txt Normalize line endings 2016-03-01 09:47:10 -06:00
strife.txt Normalize line endings 2016-03-01 09:47:10 -06:00
strife_base.txt Normalize line endings 2016-03-01 09:47:10 -06:00