Christoph Oelckers 1dbbb56a1b Merge branch 'master' into new_level_refactor ... # Conflicts: # src/p_user.cpp		2019-02-02 16:58:30 +01:00
..
alt_hud.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
doom_sbar.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
harm_sbar.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
heretic_sbar.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
hexen_sbar.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
sbarinfowrapper.txt	- fixed shader compilation.	2018-05-19 21:17:58 +02:00
statusbar.txt	- renamed the level variables.	2019-02-02 00:25:51 +01:00
strife_sbar.txt	- allow localization of Strife's log text.	2019-02-02 16:56:58 +01:00