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
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
#include "platform.h"
|
||||
#include "crossplatform.h"
|
||||
|
||||
#include "patcher.h"
|
||||
#include "main.h"
|
||||
#include "FileMgr.h"
|
||||
#include "Text.h"
|
||||
@@ -1383,7 +1382,6 @@ main(int argc, char *argv[])
|
||||
#endif
|
||||
RwV2d pos;
|
||||
RwInt32 i;
|
||||
// StaticPatcher::Apply();
|
||||
|
||||
#ifndef _WIN32
|
||||
struct sigaction act;
|
||||
|
||||
Reference in New Issue
Block a user