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
..
chex.txt
chex3.txt
common.txt	Merge remote-tracking branch 'remotes/zdoom/master'	2016-03-01 18:50:45 +01:00
conversationids.txt
doom1.txt
doom2.txt
doom2bfg.txt
doomcommon.txt
doomitems.txt
eternity.txt
hacxharm.txt
heretic.txt
hereticsw.txt
hexdd.txt
hexen.txt
mindefaults.txt
plutonia.txt
strife.txt
tnt.txt
ultdoom.txt
urbanbrawl.txt