diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-05-27 08:37:18 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-27 08:37:18 -0400 |
| commit | fdc2fefe46db79f0a19f690531cd775fbbc2740f (patch) | |
| tree | 0a5761e16b7e1685e72c09862390fb96c17fd702 /ChangeLog | |
| parent | e57420c6c67b914abb01f7c3b1d999795121ce70 (diff) | |
| parent | ea486f691d34ef2a28d06bb507ac3352e32e1f13 (diff) | |
| download | glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.gz glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.xz glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog NEWS
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 52a2b53b3f..34df6baeae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,21 @@ [BZ #12814] * iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing. +2011-05-25 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/sys/user.h + (struct user_regs_struct): Change intcs field back to cs. + +2011-05-25 Ulrich Drepper <drepper@gmail.com> + + * po/ja.po: Update from translation team. + +2011-05-23 Ulrich Drepper <drepper@gmail.com> + + [BZ #12795] + * sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_RTTIME): Define. + * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise. + 2011-05-20 Andreas Schwab <schwab@redhat.com> * stdlib/longlong.h: Update from GCC. |