[Scummvm-cvs-logs] scummvm master -> b9d1718fe1fc9649515ff4415a8668044c8a7380

lordhoto lordhoto at gmail.com
Sat Nov 26 17:41:35 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b9d1718fe1 ALL: unrecognised -> unrecognized.


Commit: b9d1718fe1fc9649515ff4415a8668044c8a7380
    https://github.com/scummvm/scummvm/commit/b9d1718fe1fc9649515ff4415a8668044c8a7380
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-26T08:40:00-08:00

Commit Message:
ALL: unrecognised -> unrecognized.

Changed paths:
    audio/softsynth/mt32/synth.cpp
    configure
    devtools/create_lure/process_actions.cpp
    engines/sword2/console.cpp



diff --git a/audio/softsynth/mt32/synth.cpp b/audio/softsynth/mt32/synth.cpp
index 322b864..8c6c319 100644
--- a/audio/softsynth/mt32/synth.cpp
+++ b/audio/softsynth/mt32/synth.cpp
@@ -801,7 +801,7 @@ void Synth::writeSysex(unsigned char device, const Bit8u *sysex, Bit32u len) {
 			}
 		}
 		if (regionNum == NUM_REGIONS) {
-			printDebug("Sysex write to unrecognised address %06x, len %d", MT32EMU_SYSEXMEMADDR(addr), len);
+			printDebug("Sysex write to unrecognized address %06x, len %d", MT32EMU_SYSEXMEMADDR(addr), len);
 			break;
 		}
 		Bit32u next = region->next(addr, len);
diff --git a/configure b/configure
index 2acb24d..edea8ee 100755
--- a/configure
+++ b/configure
@@ -423,14 +423,14 @@ option_help() {
 
 # Show an error about an unknown option
 option_error() {
-	echo "error: unrecognised option: $ac_option
+	echo "error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
 	exit 1
 }
 
 # Show an error about an unknown engine
 engine_option_error() {
-	echo "error: unrecognised engine: $1
+	echo "error: unrecognized engine: $1
 Try \`$0 --help' for more information." >&2
 	exit 1
 }
diff --git a/devtools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp
index 8539391..db96573 100644
--- a/devtools/create_lure/process_actions.cpp
+++ b/devtools/create_lure/process_actions.cpp
@@ -255,7 +255,7 @@ uint16 process_action_sequence_entry(int supportIndex, byte *data, uint16 remain
 				// Replace code offset with an index
 				params[0] = index;
 			else {
-				printf("\nEncountered unrecognised NPC code jump point: %xh\n", params[0]);
+				printf("\nEncountered unrecognized NPC code jump point: %xh\n", params[0]);
 				exit(1);
 			}
 			break;
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp
index 957b243..28e2e8ce 100644
--- a/engines/sword2/console.cpp
+++ b/engines/sword2/console.cpp
@@ -446,7 +446,7 @@ bool Debugger::Cmd_ResLook(int argc, const char **argv) {
 		DebugPrintf("<menu icon> %s\n", _vm->_resman->fetchName(res));
 		break;
 	default:
-		DebugPrintf("unrecognised fileType %d\n", type);
+		DebugPrintf("unrecognized fileType %d\n", type);
 		break;
 	}
 






More information about the Scummvm-git-logs mailing list