diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-01-23 16:47:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2015-01-23 16:47:35 +0100 |
| commit | a4f32dac3aa9fd9fd00dfb2dacaf039674437be0 (patch) | |
| tree | 22c063ae6d7784a889621c30f5215099bbb159e6 /hurd/hurdstartup.c | |
| parent | d4e923339bd73d86f99c63b5ed00dcad0e817671 (diff) | |
| parent | 58695b88a9deaecbcf7794760cc333177edaa2b4 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
hurd/hurdsocket.h
sysdeps/mach/hurd/errno-loc.c
Diffstat (limited to 'hurd/hurdstartup.c')
| -rw-r--r-- | hurd/hurdstartup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hurd/hurdstartup.c b/hurd/hurdstartup.c index 688772ad35..20b7769e00 100644 --- a/hurd/hurdstartup.c +++ b/hurd/hurdstartup.c @@ -1,5 +1,5 @@ /* Initial program startup for running under the GNU Hurd. - Copyright (C) 1991-2013 Free Software Foundation, Inc. + Copyright (C) 1991-2014 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 |