Edward Richardson e5c67cee83 Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables		2016-01-21 10:49:57 +13:00
..
doom.freedoom	Merge branch conflicts fix	2016-01-21 10:49:57 +13: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-strife	- fixed incorrect Strife player death sound.	2015-08-01 23:15:57 +02:00
strifeteaser1/mapinfo	Fixed: missing '=' in conversation ID defs	2015-04-14 19:13:25 +03:00
strifeteaser2/mapinfo	- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.	2015-04-05 00:31:15 +02:00