diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 23:14:07 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 23:14:07 +0200 |
| commit | c59fc9e953db9723b34eebe96c3ad2cef893c4bb (patch) | |
| tree | bd9c6dd8e8343d17c80a1a5d6762e1f99f3367b7 /resolv/res_hconf.h | |
| parent | 654611b4d68129954697bb94d49c671e164ec938 (diff) | |
| parent | 784b06732b24f3079e88e5be4284b645aa715512 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/ctty-input.c
hurd/ctty-output.c
hurd/hurd/signal.h
hurd/hurdexec.c
hurd/hurdmsg.c
hurd/hurdsig.c
hurd/hurdsocket.h
socket/recvmmsg.c
socket/sendmmsg.c
sysdeps/mach/hurd/i386/sigreturn.c
sysdeps/mach/hurd/i386/trampoline.c
sysdeps/mach/hurd/pipe.c
sysdeps/mach/hurd/recvmsg.c
sysdeps/mach/hurd/sendmsg.c
sysdeps/mach/hurd/sigaction.c
sysdeps/mach/hurd/sigpending.c
sysdeps/mach/hurd/sigprocmask.c
sysdeps/mach/hurd/sigsuspend.c
sysdeps/mach/hurd/sigwait.c
sysdeps/mach/hurd/socketpair.c
sysdeps/mach/hurd/tls.h
sysdeps/unix/sysv/linux/recvmmsg.c
sysdeps/unix/sysv/linux/sendmmsg.c
Diffstat (limited to 'resolv/res_hconf.h')
| -rw-r--r-- | resolv/res_hconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolv/res_hconf.h b/resolv/res_hconf.h index 90c56eb61a..ea207ab668 100644 --- a/resolv/res_hconf.h +++ b/resolv/res_hconf.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1998, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). |