Christoph Oelckers 6373b75d22 Merge branch 'master' into powerslave ... # Conflicts: # source/common/gamecontrol.cpp # source/common/version.h # wadsrc/static/engine/grpinfo.txt		2019-12-26 14:46:14 +01:00
..
blood	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
duke/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
exhumed/demolition	- making more things compile.	2019-11-24 10:03:19 +01:00
ionfury/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
nam/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
redneck/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
shadowwarrior/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
shadowwarrior.twindragon	- do not use the internal SWCUSTOM.TXT from the Twin Dragon add-on.	2019-12-26 10:47:10 +01:00
shadowwarrior.wanton	- exported level strings from Blood and Shadow Warrior to the string table.	2019-12-11 19:36:38 +01:00
ww2gi/engine	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00