diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-14 13:57:50 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-14 13:57:50 -0800 |
| commit | 3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea (patch) | |
| tree | 468f0e19dfbbf773ddd980211b042f4402919c03 /core/head.inc | |
| parent | 5e50b4d4faf398f072c0dea814b11db1a95efeec (diff) | |
| parent | b82686b524d2ee4441ce411fa6db3a210edbaa34 (diff) | |
| download | syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.gz | |
Merge branch 'master' into pathbasedsyslinux-4.00-pre20
Resolved Conflicts:
com32/Makefile
com32/include/syslinux/pxe.h
core/pxelinux.asm
core/syslinux.ld
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/head.inc')
0 files changed, 0 insertions, 0 deletions