Jarrod Johnson dde0935447 Merge branch 'master' of https://git.ipxe.org/ipxe ...

Conflicts:
	src/config/general.h
	src/net/netdev_settings.c
	src/net/tcp.c

2013-08-15 14:43:09 -04:00

..

efi_image.c

Clean up the restoration of snponly.efi a little bit

2013-07-01 15:47:29 -04:00

elf.c

[legal] Update FSF mailing address in GPL licence texts

2012-07-20 19:55:45 +01:00

embedded.c

…

script.c

[script] Allow commands following a script label

2013-07-25 13:22:43 +01:00

segment.c

[legal] Update FSF mailing address in GPL licence texts

2012-07-20 19:55:45 +01:00