projects / profile / ivi / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2454276) | patch
pxelinux: fix merge issues
authorH. Peter Anvin <hpa@zytor.com>
Mon, 24 Mar 2008 23:34:28 +0000 (16:34 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 24 Mar 2008 23:34:28 +0000 (16:34 -0700)
commit55930eb1ab60eb13f575419d240a8b764302ec1e
treee2de2db8a1d56c77a8e4b098a551a2bb08577822tree | snapshot
parent24542760a4260990244b32c1eb6232f3a4366f0dcommit | diff
pxelinux: fix merge issues

Clean up merge issues between the nolen and gpxe-support branches.
pxelinux.asm diff | blob | history
Domain: System / Uncategorized;