diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
| commit | 1173d5eff8dc423c129f442023419436ee94db23 (patch) | |
| tree | 57c2bcdc1429b2e80b91a387cd1dc561dab988eb /usr.sbin/bind/bin/rndc/unix | |
| parent | e4a92ccc5f8c866478b32a346c71150a2cdf5001 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/bin/rndc/unix')
| -rw-r--r-- | usr.sbin/bind/bin/rndc/unix/os.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/bind/bin/rndc/unix/os.c b/usr.sbin/bind/bin/rndc/unix/os.c index d89603dead8..97d5d3b19c1 100644 --- a/usr.sbin/bind/bin/rndc/unix/os.c +++ b/usr.sbin/bind/bin/rndc/unix/os.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: os.c,v 1.5.206.1 2004/03/06 10:21:33 marka Exp $ */ +/* $ISC: os.c,v 1.6.18.2 2005/04/29 00:15:41 marka Exp $ */ + +/*! \file */ #include <config.h> |