]> git.ipfire.org Git - thirdparty/elfutils.git/commit
Merge branch 'master' into robustify
authorRoland McGrath <roland@redhat.com>
Fri, 8 Jan 2010 03:51:42 +0000 (19:51 -0800)
committerRoland McGrath <roland@redhat.com>
Fri, 8 Jan 2010 03:51:42 +0000 (19:51 -0800)
commit133458b3727dcbb024ba5a3139b5a14eccb10e3b
treeca5facf0f5feb8a8f484dffe03c3821514fc03bd
parentbed89f12dcbed76865271c698d8f14b88d4d365b
parent6fd3cd104adf4107aa64e1c1e84028b4ea0b3296
Merge branch 'master' into robustify

Conflicts:
libelf/elf32_getphdr.c
libelf/elf_begin.c
libelf/ChangeLog
libelf/elf32_getphdr.c
libelf/elf32_newphdr.c
libelf/elf32_updatefile.c
libelf/elf_begin.c
libelf/libelfP.h