Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts.

Browse Source
This commit is contained in:
ghen 2007-03-30 19:57:16 +00:00
parent 7457e904c0
commit f0e38187bd
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/arpa/inet.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet.h,v 1.22 2007/01/27 21:25:23 christos Exp $ */
/* $NetBSD: inet.h,v 1.23 2007/03/30 19:57:18 ghen Exp $ */
/*
* ++Copyright++ 1983, 1993

2
include/arpa/nameser.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nameser.h,v 1.21 2007/01/27 22:33:03 christos Exp $ */
/* $NetBSD: nameser.h,v 1.22 2007/03/30 19:57:18 ghen Exp $ */
/*
* Copyright (c) 1983, 1989, 1993

2
include/arpa/nameser_compat.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nameser_compat.h,v 1.2 2007/01/27 21:25:23 christos Exp $ */
/* $NetBSD: nameser_compat.h,v 1.3 2007/03/30 19:57:19 ghen Exp $ */
/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.

2
include/netdb.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: netdb.h,v 1.57 2007/01/28 01:48:03 christos Exp $ */
/* $NetBSD: netdb.h,v 1.58 2007/03/30 19:57:16 ghen Exp $ */
/*
* Copyright (c) 1980, 1983, 1988, 1993

2
include/res_update.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: res_update.h,v 1.4 2007/01/27 21:25:23 christos Exp $ */
/* $NetBSD: res_update.h,v 1.5 2007/03/30 19:57:17 ghen Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")

2
include/resolv.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: resolv.h,v 1.32 2007/01/27 21:25:23 christos Exp $ */
/* $NetBSD: resolv.h,v 1.33 2007/03/30 19:57:18 ghen Exp $ */
/*
* Copyright (c) 1983, 1987, 1989