1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Description: Fix several typos in nx-X11
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
+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
@@ -43,7 +43,7 @@
"GL_QUAD_STRIP",
"GL_POLYGON",
"outside begin/end",
- "inside unkown primitive",
+ "inside unknown primitive",
"unknown state"
};
--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
@@ -4106,7 +4106,7 @@
if (*inst++ != REVISION) {
_mesa_set_program_error (ctx, 0, "Grammar version mismatch");
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glProgramStringARB(Grammar verison mismatch)");
+ "glProgramStringARB(Grammar version mismatch)");
err = GL_TRUE;
}
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
+++ b/nx-X11/ChangeLog.X.org
@@ -12733,7 +12733,7 @@
* programs/xkill/xkill.c: (get_window_id):
Changed cursor for the 'kill' action from XC_draped_box to
XC_Pirate. If you don't like it we can change it back
- (original author unkown).
+ (original author unknown).
* programs/xman/vendor.h:
Added 'pic' to the man page rendering command pipeline
|
