nashmuhandes 799ba36610 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_things.cpp		2016-10-17 20:58:30 +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	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -05:00
game-heretic	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -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	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -05: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