diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
commit | 4c7278413ef068bd8239fd8a6c69d64bd2c0a385 (patch) | |
tree | 4c39e8872de7babc24bed9fe528df28c8d82d427 /com32/modules/Makefile | |
parent | 749297b070d1fe3d82fd9e5c4306b4aaf257f2a1 (diff) | |
parent | 348ae6af01350a9a46f3076a2facd27918f0f603 (diff) | |
download | syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.gz |
Merge tag 'syslinux-5.00-pre10' into for-hpa/elflink/firmware
Pull in the latest prerelease that includes some bug fixes for ldlinux
and a realloc() bug in core/.
Conflicts:
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/lib/Makefile
core/pxelinux.asm
Diffstat (limited to 'com32/modules/Makefile')
-rw-r--r-- | com32/modules/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index d87127dc..e794b3b9 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -23,7 +23,8 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \ - whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 + whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 \ + hexdump.c32 TESTFILES = |