]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ef98f0 6477e68)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 May 2009 10:39:11 +0000 (12:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 May 2009 10:39:11 +0000 (12:39 +0200)
1  2 
lfs/glibc patch | diff1 | diff2 | blob | history
lfs/vsftpd patch | diff1 | diff2 | blob | history
tools/make-packages patch | diff1 | diff2 | blob | history

diff --cc lfs/glibc
Simple merge
diff --cc lfs/vsftpd
Simple merge
diff --cc tools/make-packages
Simple merge
IPFire 3.x development tree