Merge pull request #257 from Splendide-Imaginarius/mkxp-z-occurred

Fix misspelling of "occurred"

binding/binding-mri.cpp

@@ -1163,7 +1163,7 @@ static void showExc(VALUE exc, const BacktraceData &btData) {
     file = btData.scriptNames.value(file, file);
     
     std::string ms(640, '\0');
-    snprintf(&ms[0], ms.size(), "Script '%s' line %s: %s occured.\n\n%s",
+    snprintf(&ms[0], ms.size(), "Script '%s' line %s: %s occurred.\n\n%s",
              file.c_str(), line, RSTRING_PTR(name), RSTRING_PTR(msg));
     
     showMsg(ms);

src/display/gl/shader.cpp

@@ -200,7 +200,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
 	{
 		printShaderLog(vertShader);
 		throw Exception(Exception::MKXPError,
-	                    "GLSL: An error occured while compiling vertex shader '%s' in program '%s'",
+	                    "GLSL: An error occurred while compiling vertex shader '%s' in program '%s'",
 	                    vertName, programName);
 	}
 
@@ -214,7 +214,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
 	{
 		printShaderLog(fragShader);
 		throw Exception(Exception::MKXPError,
-	                    "GLSL: An error occured while compiling fragment shader '%s' in program '%s'",
+	                    "GLSL: An error occurred while compiling fragment shader '%s' in program '%s'",
 	                    fragName, programName);
 	}
 
@@ -234,7 +234,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
 	{
 		printProgramLog(program);
 		throw Exception(Exception::MKXPError,
-	                    "GLSL: An error occured while linking program '%s' (vertex '%s', fragment '%s')",
+	                    "GLSL: An error occurred while linking program '%s' (vertex '%s', fragment '%s')",
 	                    programName, vertName, fragName);
 	}
 }