diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2015-11-24 12:07:51 -0200 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2015-11-26 10:38:42 -0200 |
| commit | 2aa8f69e45aca6d59b34452ed65b3824201b0c59 (patch) | |
| tree | 463e899f4d05287a7f883adfe32cc9f0e6883514 /nss/nsswitch.h | |
| parent | a9a40adad97c1259f4eb0f768278cc2070c014e1 (diff) | |
| parent | 60f10f2326aa47c7f49b752c1730e084b2319aa7 (diff) | |
| download | glibc-2aa8f69e45aca6d59b34452ed65b3824201b0c59.zip glibc-2aa8f69e45aca6d59b34452ed65b3824201b0c59.tar.gz glibc-2aa8f69e45aca6d59b34452ed65b3824201b0c59.tar.bz2 | |
Merge branch 'release/2.19/master' into ibm/2.19/master
Conflicts:
NEWS
nss/nss_files/files-XXX.c
Diffstat (limited to 'nss/nsswitch.h')
0 files changed, 0 insertions, 0 deletions