]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4e6e4c 9aa3623)
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:01:11 +0000 (21:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:01:11 +0000 (21:01 +0100)
Conflicts:
config/rootfiles/packages/miniupnpd

1  2 
lfs/fireinfo patch | diff1 | diff2 | blob | history

diff --cc lfs/fireinfo
Simple merge
Daniel's tree of IPFire 2.x.