]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'master' into portable
authorMark Wielaard <mjw@redhat.com>
Tue, 26 Aug 2014 09:14:06 +0000 (11:14 +0200)
committerMark Wielaard <mjw@redhat.com>
Tue, 26 Aug 2014 09:14:06 +0000 (11:14 +0200)
1  2 
src/ChangeLog
src/Makefile.am

diff --cc src/ChangeLog
Simple merge
diff --cc src/Makefile.am
Simple merge