Christoph Oelckers 954f03e531 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/actor.h		2016-02-25 01:40:36 +01:00
..
base.txt	- fixed bad edit in linedef translation.	2014-08-21 13:38:47 +02:00
defines.i
doom.txt
doom_base.txt
eternity.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-25 01:40:36 +01:00
heretic.txt
heretic_base.txt
strife.txt
strife_base.txt