aboutsummaryrefslogtreecommitdiff
path: root/console-client/vga-dynacolor.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
commit13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch)
tree1e1463b03838a6f36868a4dafc7e652358a51857 /console-client/vga-dynacolor.c
parent1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff)
parent7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff)
downloadhurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.gz
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.bz2
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.zip
Merge branch 'master' into xkb
Conflicts: config.make.in configure.in
Diffstat (limited to 'console-client/vga-dynacolor.c')
-rw-r--r--console-client/vga-dynacolor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/console-client/vga-dynacolor.c b/console-client/vga-dynacolor.c
index 7b81e2f9..9289e1eb 100644
--- a/console-client/vga-dynacolor.c
+++ b/console-client/vga-dynacolor.c
@@ -177,7 +177,7 @@ dynacolor_replace_colors (dynacolor_t *dc,
based on pairs, but that increases the number of cases a
lot. */
/* Note that no color must occur twice in one replacement list,
- and that the color to be replaced must not occure either. */
+ and that the color to be replaced must not occur either. */
static signed char pref[16][9] =
{
/* Replacements for CONS_COLOR_BLACK. */