diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2005-06-07 04:17:21 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2005-06-07 04:17:21 +0000 |
| commit | 2a4e2057a6f22f0a9cf2d1e25a23e15591ccbf11 (patch) | |
| tree | 435c06d76c306da61e3c317ba2a6cb044aef5a1d /contrib/sendmail/src/mci.c | |
| parent | d912a4d5b04fce27a92e203dbfc0eca7ccc988b2 (diff) | |
| download | FreeBSD-src-2a4e2057a6f22f0a9cf2d1e25a23e15591ccbf11.zip FreeBSD-src-2a4e2057a6f22f0a9cf2d1e25a23e15591ccbf11.tar.gz | |
Resolve conflicts from sendmail 8.13.4 import
Diffstat (limited to 'contrib/sendmail/src/mci.c')
| -rw-r--r-- | contrib/sendmail/src/mci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 095700b..d3cbce6 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -14,7 +14,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.212 2004/08/04 21:11:31 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.214 2005/02/04 22:01:45 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> |
