about summary refs log tree commit diff
path: root/resource
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-07-23 00:04:15 -0400
committerUlrich Drepper <drepper@gmail.com>2011-07-23 00:04:15 -0400
commit2ee5518515103e5370b47e6170e8782d7fd2fcba (patch)
treeb184b118951bcb5e81052a889c8d896eeb86a4d0 /resource
parent7a03a9c8c4b37b88ac5e82b557d974f3161ddaf9 (diff)
parent21137f89c574de2cadda332ad874b2e6b624f950 (diff)
downloadglibc-2ee5518515103e5370b47e6170e8782d7fd2fcba.tar.gz
glibc-2ee5518515103e5370b47e6170e8782d7fd2fcba.tar.xz
glibc-2ee5518515103e5370b47e6170e8782d7fd2fcba.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'resource')
0 files changed, 0 insertions, 0 deletions