Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
authorMatt Fleming <matt.fleming@intel.com>
Mon, 5 Nov 2012 13:13:25 +0000 (13:13 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Mon, 5 Nov 2012 13:21:04 +0000 (13:21 +0000)
commit0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd
tree9a892c852fabd0a75d10c856105b4488cc87f66c
parentcdeba8ac82f529a3a4a544c4e8346887ef81cb74
parentb210bd5bfd0d7182b0a65f507c7557eeb90d5b16
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware

This merge also includes the Syslinux-4.06 release.

Conflicts:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
com32/samples/hello.c
mtools/Makefile
13 files changed:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
core/comboot.inc
core/elflink/load_env32.c
extlinux/Makefile
extlinux/main.c
libinstaller/Makefile
linux/Makefile
mk/elf.mk
mtools/Makefile
win32/Makefile
win64/Makefile