Merged the fs branch with trunk. r26949:27031

svn-id: r27032

1 files changed, 7 insertions, 6 deletions

diff --git a/engines/cruise/stringSupport.cpp b/engines/cruise/stringSupport.cpp
index 1343ba146d..54747104ff 100644
--- a/engines/cruise/stringSupport.cpp
+++ b/engines/cruise/stringSupport.cpp
@@ -1,7 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
  *
- * cinE Engine is (C) 2004-2005 by CinE Team
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
+ * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stringSupport.cpp $
+ * $Id:stringSupport.cpp 26949 2007-05-26 20:23:24Z david_corrales $
  *
  */
 
@@ -35,7 +36,7 @@ void strcatuint8(void *dest, const void *source) {
 }
 
 uint8 strcmpuint8(const void *string1, const void *string2) {
-	return strcmp((char *)string1, (char *)string2);
+	return strcmp((const char *)string1, (const char *)string2);
 }
 
 } // End of namespace Cruise