summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-03 00:49:55 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-03 00:49:55 +0100
commitba5fbcbcf3520dfbb946aeeea12cafb68de29a6c (patch)
treeb03c9a194293d4c1ec424ca37c591df674717729 /sysdeps
parent6367c9d0d30b02842323174ca4a1507beb9b0c81 (diff)
parent001db86d94a252e21b11674b71095f086932d2e4 (diff)
Merge branch 't/lockf64' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/mach/hurd/f_setlk.c2
-rw-r--r--sysdeps/mach/hurd/f_setlk.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/f_setlk.c b/sysdeps/mach/hurd/f_setlk.c
index 8cd86d0db7..9c898b130b 100644
--- a/sysdeps/mach/hurd/f_setlk.c
+++ b/sysdeps/mach/hurd/f_setlk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Free Software Foundation, Inc.
+/* Copyright (C) 2014-2015 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
diff --git a/sysdeps/mach/hurd/f_setlk.h b/sysdeps/mach/hurd/f_setlk.h
index 363d87fd17..a9d09fd90a 100644
--- a/sysdeps/mach/hurd/f_setlk.h
+++ b/sysdeps/mach/hurd/f_setlk.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Free Software Foundation, Inc.
+/* Copyright (C) 2014-2015 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