]> 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: 714bdb6 d27de41)
Merge branch 'updates'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 May 2009 15:13:38 +0000 (17:13 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 May 2009 15:13:38 +0000 (17:13 +0200)
Conflicts:
lfs/util-linux-ng

1  2 
lfs/util-linux-ng patch | diff1 | diff2 | blob | history

diff --cc lfs/util-linux-ng
Simple merge
IPFire 3.x development tree