aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-04-09 21:25:13 +0200
committerAndreas Jaeger <aj@suse.de>2012-04-09 21:25:13 +0200
commit8a1fbaaf75536088b4d505409e0e87975d8cf8d5 (patch)
tree1df51c8e1660d2ffdce8bf9ff75184e9affcc165 /nss
parent03879793292b70f4c3ca64259e80a2b44787e865 (diff)
parent8de131cbff365a34392ee3314ee5ea8007a877fe (diff)
downloadglibc-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