Merge branch 'master' into miami

# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 57176561..bf81bd8a 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -50,7 +50,7 @@ CPedModelInfo::SetClump(RpClump *clump)
 
 struct ColNodeInfo
 {
-	char *name;
+	Const char *name;
 	int pedNode;
 	int pieceType;
 	float x, z;