]> 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: f24c956 810a7ea)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Sat, 24 May 2008 11:12:46 +0000 (13:12 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sat, 24 May 2008 11:12:46 +0000 (13:12 +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