projects / platform / upstream / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5ac7c3 978437d)
Merge commit 'origin/master' into fsc syslinux-4.00-pre9
authorH. Peter Anvin <hpa@zytor.com>
Tue, 29 Dec 2009 01:52:38 +0000 (17:52 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 29 Dec 2009 01:52:38 +0000 (17:52 -0800)
Resolved Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Trivial merge
Domain: System / Base;