]> 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: 9571792 8adff61)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Apr 2009 07:51:10 +0000 (09:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Apr 2009 07:51:10 +0000 (09:51 +0200)
Conflicts:
lfs/lsof
lfs/strip

1  2 
lfs/lsof patch | diff1 | diff2 | blob | history
lfs/openldap patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc lfs/lsof
Simple merge
diff --cc lfs/openldap
Simple merge
diff --cc make.sh
Simple merge
IPFire 3.x development tree