]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'pending' into pending-unwind
authorJan Kratochvil <jan.kratochvil@redhat.com>
Fri, 12 Oct 2012 18:46:34 +0000 (20:46 +0200)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Fri, 12 Oct 2012 18:46:34 +0000 (20:46 +0200)
1  2 
libebl/ebl-hooks.h
libebl/libebl.h

Simple merge
diff --cc libebl/libebl.h
Simple merge