aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 14:02:52 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 14:02:52 +0200
commita3a295288189d1312f5abef0e7b4cc57b948e7d3 (patch)
treed3f008069f724c2e9d3b152a62b6505a8c2da6f7 /nx-X11/extras
parent8307d4f330cde01a1f048598be184aa4bfa54501 (diff)
parent12ca29bf5418f0a7c4d7de57c5cd34c9151adac3 (diff)
downloadnx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.tar.gz
nx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.tar.bz2
nx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.zip
Merge branch 'sunweaver-pr/debian-packaging-updates' into 3.6.x
Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/151 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Fri, 01 Jul 2016 14:03:44 +0200
Diffstat (limited to 'nx-X11/extras')
-rw-r--r--nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
index c998f7c66..7da4139d2 100644
--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
@@ -97,8 +97,8 @@
*
* Cosmetic Stuff
* -----------------------------------------------------
- * - remove any leftover unused grammer.c stuff (dict_ ?)
- * - fix grammer.c error handling so its not static
+ * - remove any leftover unused grammar.c stuff (dict_ ?)
+ * - fix grammar.c error handling so its not static
* - #ifdef around stuff pertaining to extentions
*
* Outstanding Questions:
@@ -3979,7 +3979,7 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
_mesa_set_program_error (ctx, error_pos, error_msg);
_mesa_error (ctx, GL_INVALID_OPERATION,
- "Error loading grammer rule set");
+ "Error loading grammar rule set");
return GL_FALSE;
}