tag | fda10d48164dd69bcc1791562a2e5ae9c1a79896 | |
---|---|---|
tagger | Matt Fleming <matt.fleming@intel.com> | Tue Jan 29 07:31:49 2013 -0800 |
object | bf20364b582c383b4927f898de213b1cc0981a80 |
syslinux-6.00-pre4
commit | bf20364b582c383b4927f898de213b1cc0981a80 | [log] [tgz] |
---|---|---|
author | Matt Fleming <matt.fleming@intel.com> | Tue Jan 29 14:01:07 2013 +0000 |
committer | Matt Fleming <matt.fleming@intel.com> | Tue Jan 29 15:11:28 2013 +0000 |
tree | 5412e0c14cf74df0d7ea29ff182e23d3281aac3e | |
parent | afd985f6eec18a0f66a8fc55f9c5e3431128310f [diff] | |
parent | a2d79191b501276026a0a16ec2fa664630a20476 [diff] |
Merge tag 'syslinux-5.01' into firmware Conflicts: Makefile NEWS com32/cmenu/Makefile com32/elflink/ldlinux/Makefile com32/gfxboot/Makefile com32/gpllib/Makefile com32/include/sys/module.h com32/lib/Makefile com32/lib/sys/module/elf_module.c com32/menu/Makefile com32/rosh/Makefile com32/samples/Makefile core/init.c mk/elf.mk Signed-off-by: Matt Fleming <matt.fleming@intel.com>