aboutsummaryrefslogtreecommitdiff
path: root/libstore/argp.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 /libstore/argp.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 'libstore/argp.c')
-rw-r--r--libstore/argp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstore/argp.c b/libstore/argp.c
index 9af7ae57..6ed79964 100644
--- a/libstore/argp.c
+++ b/libstore/argp.c
@@ -365,7 +365,7 @@ parse_opt (int opt, char *arg, struct argp_state *state)
break;
case ARGP_KEY_ERROR:
- /* Parsing error occured, free everything. */
+ /* Parsing error occurred, free everything. */
store_parsed_free (parsed); break;
case ARGP_KEY_SUCCESS: