projects
/
profile
/
ivi
/
syslinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e48cb3
88c00ac
)
Merge branch 'master' into fsc
syslinux-4.00-pre17
author
H. Peter Anvin
<hpa@zytor.com>
Sat, 6 Feb 2010 01:28:27 +0000
(17:28 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Sat, 6 Feb 2010 01:28:27 +0000
(17:28 -0800)
Resolved Conflicts:
core/pxelinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Trivial merge
projects / profile / ivi / syslinux.git / commitdiff