]> 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: d97b2de 1f10d16)
Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Fri, 20 Aug 2010 12:29:07 +0000 (14:29 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Fri, 20 Aug 2010 12:29:07 +0000 (14:29 +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