]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31f3654 5c23710)
Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Fri, 15 May 2009 06:08:12 +0000 (08:08 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Fri, 15 May 2009 06:08:12 +0000 (08:08 +0200)
1  2 
doc/packages-list.txt patch | diff1 | diff2 | blob | history

diff --cc doc/packages-list.txt
Simple merge
IPFire 2.x development tree