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

# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp

1 files changed, 0 insertions, 2 deletions

diff --git a/src/core/World.cpp b/src/core/World.cpp
index 3022368b..14624f97 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -29,8 +29,6 @@
 #include "WaterLevel.h"
 #include "World.h"
 
-// --MIAMI: file done
-
 #define OBJECT_REPOSITION_OFFSET_Z 2.0f
 
 CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];