about summary refs log tree commit diff
path: root/nss
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-11-15 13:29:11 -0500
committerUlrich Drepper <drepper@gmail.com>2011-11-15 13:29:11 -0500
commit116415f80eeb88e1973a160b8a2ee707d24481b4 (patch)
tree2dd24107d610a0bdff14fc01a0ded3ffb0b7adf9 /nss
parent8056ea641faa89225cffcf8507cd20de95b8b6ae (diff)
parent446514f97eaf555200f9ec4f369223f984e638a5 (diff)
downloadglibc-116415f80eeb88e1973a160b8a2ee707d24481b4.tar.gz
glibc-116415f80eeb88e1973a160b8a2ee707d24481b4.tar.xz
glibc-116415f80eeb88e1973a160b8a2ee707d24481b4.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	sysdeps/unix/sysv/linux/clock_gettime.c
Diffstat (limited to 'nss')
0 files changed, 0 insertions, 0 deletions