Merge branches 'auto-extension' and 'fix-build-warnings' into elflink
authorMatt Fleming <matt.fleming@intel.com>
Tue, 17 Apr 2012 10:24:56 +0000 (11:24 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 17 Apr 2012 10:24:56 +0000 (11:24 +0100)
commit34ec5204dc2f2e6130f611b0710d475f7dd9d609
tree26413040541380af66826b17635779071d55d110
parent42c79110981c7117d6f337305c90dfdc6fb8d645
parent88cebcdc03a4aefa978b20b5f60e7ea10f07b797
Merge branches 'auto-extension' and 'fix-build-warnings' into elflink

Conflicts:
com32/elflink/ldlinux/ldlinux.c
com32/elflink/ldlinux/ldlinux.c