diff options
author | Ulrich Drepper <drepper@gmail.com> | 2012-03-08 02:49:12 -0500 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2012-03-08 02:49:12 -0500 |
commit | ca2ff9fc0492c42f5407a64dd009baa0df488887 (patch) | |
tree | 195a6b67174569b783ecdeda4c94a2b36f0445ce /ChangeLog.2 | |
parent | 70bca0a394a2135927210007f1dd6eceafe1aaf5 (diff) | |
parent | 65b81130c5006b1140c3d8b59038a68004ff61c8 (diff) | |
download | glibc-ca2ff9fc0492c42f5407a64dd009baa0df488887.tar.gz glibc-ca2ff9fc0492c42f5407a64dd009baa0df488887.tar.xz glibc-ca2ff9fc0492c42f5407a64dd009baa0df488887.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog.2')
0 files changed, 0 insertions, 0 deletions