Merge branch 'lwip' into elflink
authorMatt Fleming <matt.fleming@intel.com>
Mon, 25 Feb 2013 15:25:16 +0000 (15:25 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 26 Feb 2013 11:29:04 +0000 (11:29 +0000)
commit76da2ae050d72a31fd47c2fb53f7081781de62ff
tree6da146b5f19ca17ff24d4e74940f14264d38f914
parent41c29c26d70fde563d7c255872bbadad87a39dfa
parent79312306de0150ef64213ef9fbc5aa8580544f03
Merge branch 'lwip' into elflink

Welcome to Syslinux 5.10.

Conflicts:
NEWS
com32/lib/Makefile
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/modules/Makefile
com32/modules/prdhcp.c
core/Makefile
core/cmdline.inc
core/com32.inc
core/comboot.inc
core/configinit.inc
core/fs/chdir.c
core/fs/fs.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/idle.c
core/include/ctype.h
core/init.inc
core/mem/init.c
core/parseconfig.inc
core/runkernel.inc
core/syslinux.ld
core/ui.inc
doc/comboot.txt
version
52 files changed:
NEWS
com32/chain/utility.c
com32/elflink/ldlinux/chainboot.c
com32/elflink/ldlinux/execute.c
com32/elflink/ldlinux/ldlinux.c
com32/elflink/ldlinux/readconfig.c
com32/gfxboot/gfxboot.c
com32/include/linux/list.h
com32/include/syslinux/config.h
com32/include/syslinux/pxe_api.h
com32/lib/Makefile
com32/lib/errno.c
com32/lib/sys/file.h
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/lib/syslinux/runimage.c
com32/menu/menumain.c
com32/menu/readconfig.c
com32/modules/Makefile
core/Makefile
core/callback.inc
core/diskfs.inc
core/errno.c
core/extern.inc
core/fs/chdir.c
core/fs/diskio.c
core/fs/fs.c
core/fs/lib/searchconfig.c
core/fs/pxe/dhcp_option.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/http.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/fs/readdir.c
core/idle.c
core/include/core.h
core/include/fs.h
core/init.c
core/isolinux.asm
core/layout.inc
core/mem/free.c
core/mem/malloc.c
core/mem/malloc.h
core/pm.inc
core/pmapi.c
core/pxelinux.asm
core/sysappend.c
core/syslinux.ld
doc/pxelinux.txt
doc/syslinux.txt
mk/syslinux.mk
version