about summary refs log tree commit diff
path: root/resource
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-03-25 19:45:20 -0700
committerUlrich Drepper <drepper@redhat.com>2010-03-25 19:45:20 -0700
commit70c90289ff7e2f1ca976618bcf342d9c65c746fc (patch)
treeb137a73907e3abed69bafe89483de0af3ce2b814 /resource
parent89a4419cc384c090b1eabe610647aa4e14436a3f (diff)
parent34b514dff6acf8f1cac0afefd24049e025fd62ea (diff)
downloadglibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.tar.gz
glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.tar.xz
glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.zip
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'resource')
0 files changed, 0 insertions, 0 deletions