diff options
author | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
commit | 46658a1cbccb564942a147a747a7579099773764 (patch) | |
tree | 2ebe1e567b66dcd9e126b89c236117d1f15eaa7c /nis/nss_nis | |
parent | b2ef2c014b9c66995a3eb4f310ae7c5c510279bf (diff) | |
parent | fbd643b66230bafead971b8cd3b0cfe70f5d22ce (diff) | |
download | glibc-46658a1cbccb564942a147a747a7579099773764.tar.gz glibc-46658a1cbccb564942a147a747a7579099773764.tar.xz glibc-46658a1cbccb564942a147a747a7579099773764.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'nis/nss_nis')
0 files changed, 0 insertions, 0 deletions