Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nikolay Korolev
2020-04-23 19:12:20 +03:00
49 changed files with 5408 additions and 7457 deletions

View File

@ -1,7 +1,6 @@
#define WITHWINDOWS // for our script loading hack
#include "common.h"
#include "Script.h"
#include "ScriptCommands.h"