]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'master' into pending
authorJan Kratochvil <jan.kratochvil@redhat.com>
Fri, 12 Oct 2012 19:00:46 +0000 (21:00 +0200)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Fri, 12 Oct 2012 19:00:46 +0000 (21:00 +0200)
Conflicts:
backends/ChangeLog
src/ChangeLog
src/readelf.c

1  2 
src/readelf.c

diff --cc src/readelf.c
Simple merge