projects / profile / ivi / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8afab21 bf3bb17)
Merge branch 'master' into disklib
authorH. Peter Anvin <hpa@zytor.com>
Fri, 30 Jul 2010 17:24:04 +0000 (10:24 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 30 Jul 2010 17:24:04 +0000 (10:24 -0700)
Resolved Conflicts:
com32/modules/chain.c

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

Trivial merge
Domain: System / Uncategorized;