diff options
author | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
commit | 46658a1cbccb564942a147a747a7579099773764 (patch) | |
tree | 2ebe1e567b66dcd9e126b89c236117d1f15eaa7c /ChangeLog | |
parent | b2ef2c014b9c66995a3eb4f310ae7c5c510279bf (diff) | |
parent | fbd643b66230bafead971b8cd3b0cfe70f5d22ce (diff) | |
download | glibc-46658a1cbccb564942a147a747a7579099773764.tar.gz glibc-46658a1cbccb564942a147a747a7579099773764.tar.xz glibc-46658a1cbccb564942a147a747a7579099773764.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 06a002eef4..7b25c3f292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,10 @@ * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise +2010-06-14 Roland McGrath <roland@redhat.com> + + * manual/libc.texinfo (@copying): Change to GFDL v1.3. + 2010-06-07 Jakub Jelinek <jakub@redhat.com> * libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of |