diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-05-09 09:01:52 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-09 09:01:52 -0400 |
| commit | 0f7843d00f0703837f380eb03143a4ed5d485ead (patch) | |
| tree | 4946d0f4f81206f79cb49496a2f4821dd4b92222 /nss | |
| parent | 445d72ca267e2f4815847c3ad2bc108952049444 (diff) | |
| parent | 0e8131bb32cf026c87baeacb7abf2a9bdbbc4953 (diff) | |
| download | glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.tar.gz glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.tar.xz glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: localedata/ChangeLog
Diffstat (limited to 'nss')
0 files changed, 0 insertions, 0 deletions