projects / profile / ivi / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79c5c65 6bb2cbb)
Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Sun, 14 Jun 2009 23:21:33 +0000 (16:21 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 14 Jun 2009 23:21:33 +0000 (16:21 -0700)
Resolved Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1  2 
core/bootsect.inc patch | diff1 | diff2 | blob | history

diff --cc core/bootsect.inc
Simple merge
Domain: System / Uncategorized;