]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
projects / thirdparty / elfutils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2423ad 14802e9)
Merge branch 'pending' into jankratochvil/unwind
authorJan Kratochvil <jan.kratochvil@redhat.com>
Wed, 17 Oct 2012 22:25:06 +0000 (00:25 +0200)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Wed, 17 Oct 2012 22:25:06 +0000 (00:25 +0200)
Conflicts:
libdwfl/argp-std.c

1  2 
libdwfl/libdwfl.h patch | diff1 | diff2 | blob | history

diff --cc libdwfl/libdwfl.h
Simple merge
Mirror of https://sourceware.org/git/elfutils.git