Merge branch 'master' into upstream-merge-27454

This commit is contained in:
LetterJay
2017-05-30 23:48:25 -05:00
committed by GitHub
280 changed files with 401755 additions and 224891 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
SetupExternalRSC()
GLOB.config_error_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
GLOB.config_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once)