diff options
| author | peter <peter@FreeBSD.org> | 1997-06-22 10:59:24 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-22 10:59:24 +0000 |
| commit | e00aed2084aea5f9880023debf362de96dd10ad2 (patch) | |
| tree | 5f844f9e367fdc809c7ac2e00e2c104f128879c3 /contrib/cvs/src/rcs.h | |
| parent | 891d25f8be548bdcb7be081005a66c22b10145d5 (diff) | |
| download | FreeBSD-src-e00aed2084aea5f9880023debf362de96dd10ad2.zip FreeBSD-src-e00aed2084aea5f9880023debf362de96dd10ad2.tar.gz | |
merge conflicts
Diffstat (limited to 'contrib/cvs/src/rcs.h')
| -rw-r--r-- | contrib/cvs/src/rcs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h index 64d03e0..5054fd0 100644 --- a/contrib/cvs/src/rcs.h +++ b/contrib/cvs/src/rcs.h @@ -129,3 +129,7 @@ int rcs_change_text PROTO ((const char *, char *, size_t, const char *, void RCS_setlocalid PROTO ((const char *arg)); void RCS_setincexc PROTO ((const char *arg)); + +/* From import.c. */ +extern int add_rcs_file PROTO ((char *, char *, char *, char *, + char *, char *, int, char **, FILE *)); |
