projects
/
people
/
pmueller
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2cb7cef
cb4fdb5
)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
author
Ben Schweikert
<trikolon@ipfire.org>
Tue, 8 Sep 2009 07:55:37 +0000
(09:55 +0200)
committer
Ben Schweikert
<trikolon@ipfire.org>
Tue, 8 Sep 2009 07:55:37 +0000
(09:55 +0200)
1
2
config/kernel/kernel.config.i586-ipfire-xen
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/kernel/kernel.config.i586-ipfire-xen
Simple merge