nashmuhandes 4292311f53 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_things.cpp # src/r_things.h		2016-07-05 21:52:38 +08:00
..
doom.freedoom	Merge branch conflicts fix	2016-01-21 10:49:57 +13:00
game-doom/graphics	Replaced copyrighted assets contained inside the engine PK3.	2016-04-27 22:35:28 +08:00
game-doomchex	Added gametype-based filter	2015-04-05 20:24:49 -05:00
game-heretic	Externalized default key bindings	2015-04-05 21:40:53 -05:00
game-hexen	Externalized default key bindings	2015-04-05 21:40:53 -05:00
game-raven/graphics	Replaced copyrighted assets contained inside the engine PK3.	2016-04-27 22:35:28 +08:00
game-strife	- fixed: Checking for quest item 0 should not print an error message but silently fail.	2016-07-03 13:32:40 +02:00
strifeteaser1/mapinfo	Normalize line endings	2016-03-01 09:47:10 -06:00
strifeteaser2/mapinfo	Normalize line endings	2016-03-01 09:47:10 -06:00