diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /libshouldbeinlibc/cacheq.c | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'libshouldbeinlibc/cacheq.c')
-rw-r--r-- | libshouldbeinlibc/cacheq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libshouldbeinlibc/cacheq.c b/libshouldbeinlibc/cacheq.c index eb41c6e9..5649903a 100644 --- a/libshouldbeinlibc/cacheq.c +++ b/libshouldbeinlibc/cacheq.c @@ -106,7 +106,7 @@ cacheq_set_length (struct cacheq *cq, int length) th->next = next_th; } - /* Call user hooks as appropiate. */ + /* Call user hooks as appropriate. */ if (fh && th) { if (cq->move_entry) |