Merge branch 'syslinux-3.7x'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 18:27:25 +0000 (11:27 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 18:27:25 +0000 (11:27 -0700)
Conflicts:
core/bootsect.inc
version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1  2 
core/bootsect.inc
core/pxelinux.asm
core/runkernel.inc
core/ui.inc

Simple merge
Simple merge
Simple merge
diff --cc core/ui.inc
Simple merge