Merged the fs branch with trunk. r26949:27031

svn-id: r27032

1 files changed, 8 insertions, 6 deletions

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index d9ac3e42df..f60908d3ed 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1,6 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2007 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * 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
@@ -16,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/scumm/detection.cpp $
+ * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $
  *
  */
 
@@ -319,6 +321,7 @@ static void computeGameSettingsFromMD5(const FSList &fslist, const GameFilenameP
 static void detectGames(const FSList &fslist, Common::List<DetectorResult> &results, const char *gameid) {
 	DescMap fileMD5Map;
 	DetectorResult dr;
+	char md5str[32+1];
 	
 	for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 		if (!file->isDirectory()) {
@@ -369,7 +372,6 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu
 		//
 		DetectorDesc &d = fileMD5Map[file];
 		if (d.md5.empty()) {
-			char md5str[32+1];
 			if (Common::md5_file_string(d.node, md5str, kMD5FileSizeLimit)) {
 
 				d.md5 = md5str;