diff options
author | Ulrich Drepper <drepper@redhat.com> | 2009-09-29 06:13:11 -0700 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2009-09-29 06:13:11 -0700 |
commit | f8d7c1eaddec2ab245dd4920107e273114a9b0e8 (patch) | |
tree | 8bf19868f1d5dab641605b3e7a1a1adab3314355 /nss/hosts-lookup.c | |
parent | 199eb0de8d673fb23aa127721054b4f1803d61f3 (diff) | |
parent | ff2835318177dd4600d3aa03626f4b5748e3fbeb (diff) | |
download | glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.tar.gz glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.tar.xz glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'nss/hosts-lookup.c')
0 files changed, 0 insertions, 0 deletions