about summary refs log tree commit diff
path: root/resource
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-03-27 21:35:36 +0200
committerAndreas Jaeger <aj@suse.de>2012-03-27 21:35:36 +0200
commit1e3cdfda7486316198ec0587a8aa96f50e88b3bc (patch)
tree4badfb248f3392b95be5b86d747c98331409dca7 /resource
parentc876e002a2484d53c797140c005f3630e6abec72 (diff)
parentd6373f9ce3972a1891e4d09479a98e0dbc7e3d73 (diff)
downloadglibc-1e3cdfda7486316198ec0587a8aa96f50e88b3bc.tar.gz
glibc-1e3cdfda7486316198ec0587a8aa96f50e88b3bc.tar.xz
glibc-1e3cdfda7486316198ec0587a8aa96f50e88b3bc.zip
Merge branch 'elf-move'
Conflicts:
	debug/backtracesymsfd.c
	sysdeps/generic/elf/backtracesymsfd.c
	sysdeps/i386/configure.in
Diffstat (limited to 'resource')
0 files changed, 0 insertions, 0 deletions