diff options
author | Andreas Jaeger <aj@suse.de> | 2012-04-09 21:25:13 +0200 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2012-04-09 21:25:13 +0200 |
commit | 8a1fbaaf75536088b4d505409e0e87975d8cf8d5 (patch) | |
tree | 1df51c8e1660d2ffdce8bf9ff75184e9affcc165 /nss | |
parent | 03879793292b70f4c3ca64259e80a2b44787e865 (diff) | |
parent | 8de131cbff365a34392ee3314ee5ea8007a877fe (diff) | |
download | glibc-8a1fbaaf75536088b4d505409e0e87975d8cf8d5.zip glibc-8a1fbaaf75536088b4d505409e0e87975d8cf8d5.tar.gz glibc-8a1fbaaf75536088b4d505409e0e87975d8cf8d5.tar.bz2 |
Merge branch 'master' of git://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'nss')
0 files changed, 0 insertions, 0 deletions