aboutsummaryrefslogtreecommitdiff
path: root/resource/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-05 12:46:12 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-05 12:46:12 -0400
commit3b142ce5728f6d683f3375fb33099ebf243f6681 (patch)
tree896f73d70426cd798e72bd786c0cb000d55b50ad /resource/Makefile
parent2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba (diff)
parent5f4318d102d604e2f80bc97927e2d80f76063639 (diff)
downloadglibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar
glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.gz
glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.bz2
glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'resource/Makefile')
0 files changed, 0 insertions, 0 deletions