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 /libftpconn/fname.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'libftpconn/fname.c')
| -rw-r--r-- | libftpconn/fname.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libftpconn/fname.c b/libftpconn/fname.c index afa0852b..3be6eeec 100644 --- a/libftpconn/fname.c +++ b/libftpconn/fname.c @@ -23,7 +23,7 @@ #include "ftpconn.h" /* Give a name which refers to a directory file, and a name in that - directory, this should return in COMPOSITE the composite name refering to + directory, this should return in COMPOSITE the composite name referring to that name in that directory, in malloced storage. */ error_t ftp_conn_append_name (struct ftp_conn *conn, |