projects
/
profile
/
ivi
/
syslinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e511025
c072d12
)
Merge commit 'origin/adv' into gpxe-support
author
H. Peter Anvin
<hpa@zytor.com>
Thu, 10 Jan 2008 19:23:31 +0000
(11:23 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Thu, 10 Jan 2008 19:31:01 +0000
(11:31 -0800)
Conflicts:
pxe.inc
1
2
NEWS
patch
|
diff1
|
diff2
|
blob
|
history
dnsresolv.inc
patch
|
diff1
|
diff2
|
blob
|
history
pxe.inc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
NEWS
Simple merge
diff --cc
dnsresolv.inc
Simple merge
diff --cc
pxe.inc
Simple merge
projects / profile / ivi / syslinux.git / commitdiff