aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2016-05-25 10:04:06 -0300
committerGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2016-05-25 10:04:06 -0300
commit2feb372c585eb77141adbff24d4958e5a5e6678a (patch)
tree79416b255a6e61e6fdbc913da3be86d87a8a25ff /nss
parentc69c361ca6bf95f8c665884ee863168a321d472a (diff)
parent916ef0f69613613e11123657bff127bd26104630 (diff)
downloadglibc-ibm/2.20/master.zip
glibc-ibm/2.20/master.tar.gz
glibc-ibm/2.20/master.tar.bz2
Merge release/2.20/master into ibm/2.20/masteribm/2.20/master
Conflicts: NEWS
Diffstat (limited to 'nss')
0 files changed, 0 insertions, 0 deletions