]> 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: b837f5c 83ace54)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Fri, 18 Dec 2009 09:01:50 +0000 (10:01 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Fri, 18 Dec 2009 09:01:50 +0000 (10:01 +0100)
1  2 
doc/packages-list.txt patch | diff1 | diff2 | blob | history

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