]> 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: cc3f6e5 0235d31)
Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@ipfire.localdomain>
Sun, 5 Apr 2009 09:17:01 +0000 (11:17 +0200)
committerroot <root@ipfire.localdomain>
Sun, 5 Apr 2009 09:17:01 +0000 (11:17 +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