]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f56b0d5 75842d0)
Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Tue, 13 Jul 2010 11:13:44 +0000 (13:13 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Tue, 13 Jul 2010 11:13:44 +0000 (13:13 +0200)
1  2 
doc/packages-list.txt patch | diff1 | diff2 | blob | history

diff --cc doc/packages-list.txt
Simple merge
Timo's tree of IPFire 2.x