]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4720b24 5719939)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Sep 2010 19:49:53 +0000 (21:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Sep 2010 19:49:53 +0000 (21:49 +0200)
1  2 
pkgs/core/kernel/kernel.nm patch | diff1 | diff2 | blob | history

diff --cc pkgs/core/kernel/kernel.nm
Simple merge
IPFire 3.x development tree