projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 821b6a6 34ba75f)
Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Sat, 9 Oct 2010 11:04:02 +0000 (13:04 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Sat, 9 Oct 2010 11:04:02 +0000 (13:04 +0200)
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