projects / platform / upstream / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19cf98b 2f9949c)
Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:52:02 +0000 (15:52 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:52:37 +0000 (15:52 -0700)
Conflicts:
version

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

Trivial merge
Domain: System / Base;