]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e959976 8ba55ea)
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Dec 2010 17:27:26 +0000 (18:27 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Dec 2010 17:27:26 +0000 (18:27 +0100)
1  2 
config/rootfiles/core/44/update.sh patch | diff1 | diff2 | blob | history
lfs/linux patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/core/44/update.sh
Simple merge
diff --cc lfs/linux
Simple merge
Peter's tree of IPFire 2.x