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	- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)	2015-04-27 10:24:49 +02:00
doom	Merge remote-tracking branch 'remotes/zdoom/master'	2016-03-01 18:50:45 +01:00
heretic	Normalize line endings	2016-03-01 09:47:10 -06:00
hexen	Normalize line endings	2016-03-01 09:47:10 -06:00
raven	Normalize line endings	2016-03-01 09:47:10 -06:00
shared	Normalize line endings	2016-03-01 09:47:10 -06:00
strife	Normalize line endings	2016-03-01 09:47:10 -06:00
actor.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
constants.txt	Updated to scripting branch merge.	2016-02-04 20:17:46 -06:00