Merge remote-tracking branch 'origin/master' into miami

# Conflicts: # README.md # src/core/Frontend.cpp # src/core/Frontend.h # src/peds/Ped.cpp # src/peds/Ped.h # src/render/Renderer.cpp # src/vehicles/Plane.cpp
2020-07-22 18:29:17 +03:00
parent b182fa4bb8 afc38c0d72
commit f882586eb8
9 changed files with 111 additions and 267 deletions
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@ -2,7 +2,6 @@
 #define WITHWINDOWS
 #include "common.h"
 #include "crossplatform.h"
-#include "patcher.h"
 #include "Renderer.h"
 #include "Occlusion.h"
 #include "Credits.h"