summaryrefslogtreecommitdiff
path: root/hurd/hurdsig.c
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-05-21 00:36:02 +0200
committerThomas Schwinge <thomas@codesourcery.com>2013-05-21 00:36:02 +0200
commitc664cadc6c41b40988cb86c233e440b106bd55e9 (patch)
tree2da6f953881a6e8206ad6e5ac275e627ca27dca6 /hurd/hurdsig.c
parentfd0bd821d522b006de9c10cb444ba878508c47e7 (diff)
parent05e15af474039e849e96cf3351b90bf15eb17379 (diff)
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Conflicts: hurd/ctty-input.c hurd/ctty-output.c hurd/hurd/signal.h hurd/hurdexec.c hurd/hurdmsg.c sysdeps/mach/hurd/i386/sigreturn.c sysdeps/mach/hurd/i386/trampoline.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
Diffstat (limited to 'hurd/hurdsig.c')
-rw-r--r--hurd/hurdsig.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 140f951017..72c582f00b 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2005,2008,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or