Merge branch 'master' into jgrpp

# Conflicts:
#	src/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-20 13:15:32 +00:00
14 changed files with 35 additions and 23 deletions

View File

@@ -3246,7 +3246,7 @@ cat = SC_EXPERT
[SDT_BOOL]
var = pf.yapf.rail_firstred_twoway_eol
from = SLV_28
def = false
def = true
cat = SC_EXPERT
[SDT_VAR]