http://git.etherboot.org
/
people
/
xl0
/
gpxe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e88138
376baca
)
Merge branch 'master' into curses
author
Holger Lubitz
<hal@duncan.ol.sub.de>
Thu, 23 Aug 2007 21:15:54 +0000
(23:15 +0200)
committer
Holger Lubitz
<hal@duncan.ol.sub.de>
Thu, 23 Aug 2007 21:15:54 +0000
(23:15 +0200)
Conflicts:
src/include/compiler.h
src/include/readline/readline.h
created by strings branch merge. resolved.
Trivial merge
http://git.etherboot.org / people / xl0 / gpxe.git / commitdiff