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/text/Text.cpp b/src/text/Text.cpp
index efb8b2a9..6385eb50 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -9,8 +9,6 @@
 #include "Text.h"
 #include "Timer.h"
 
-//--MIAMI: file done
-
 static wchar WideErrorString[25];
 
 CText *CText::msInstance = nil;