Commit 231ffa85 authored by Mike Gabriel's avatar Mike Gabriel

Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX…

Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort.
parent 91dc4b50
Description: Fix several typos in nx-X11 Description: Fix several typos in nx-X11
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
@@ -729,7 +729,7 @@
for (i = 0; attr[i]; i += 2) {
if (!strcmp (attr[i], "driver")) driver = attr[i+1];
else if (!strcmp (attr[i], "screen")) screen = attr[i+1];
- else XML_WARNING("unkown device attribute: %s.", attr[i]);
+ else XML_WARNING("unknown device attribute: %s.", attr[i]);
}
if (driver && strcmp (driver, data->driverName))
data->ignoringDevice = data->inDevice;
@@ -749,7 +749,7 @@
for (i = 0; attr[i]; i += 2) {
if (!strcmp (attr[i], "name")) name = attr[i+1];
else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
- else XML_WARNING("unkown application attribute: %s.", attr[i]);
+ else XML_WARNING("unknown application attribute: %s.", attr[i]);
}
if (exec && strcmp (exec, data->execName))
data->ignoringApp = data->inApp;
@@ -762,7 +762,7 @@
for (i = 0; attr[i]; i += 2) {
if (!strcmp (attr[i], "name")) name = attr[i+1];
else if (!strcmp (attr[i], "value")) value = attr[i+1];
- else XML_WARNING("unkown option attribute: %s.", attr[i]);
+ else XML_WARNING("unknown option attribute: %s.", attr[i]);
}
if (!name) XML_WARNING1 ("name attribute missing in option.");
if (!value) XML_WARNING1 ("value attribute missing in option.");
--- a/nx-X11/extras/Mesa/src/mesa/main/debug.c --- a/nx-X11/extras/Mesa/src/mesa/main/debug.c
+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c +++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
...@@ -52,17 +23,6 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> ...@@ -52,17 +23,6 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
err = GL_TRUE; err = GL_TRUE;
} }
else { else {
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
+++ b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
@@ -88,7 +88,7 @@
case EPrefixError: append("ERROR: "); break;
case EPrefixInternalError: append("INTERNAL ERROR: "); break;
case EPrefixUnimplemented: append("UNIMPLEMENTED: "); break;
- default: append("UNKOWN ERROR: "); break;
+ default: append("UNKNOWN ERROR: "); break;
}
}
void location(TSourceLoc loc) {
--- a/nx-X11/ChangeLog.X.org --- a/nx-X11/ChangeLog.X.org
+++ b/nx-X11/ChangeLog.X.org +++ b/nx-X11/ChangeLog.X.org
@@ -12733,7 +12733,7 @@ @@ -12733,7 +12733,7 @@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment