]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5684380 9a6b4cb)
Merge branch 'next' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Oct 2013 12:13:39 +0000 (14:13 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Oct 2013 12:13:39 +0000 (14:13 +0200)
1  2 
config/rootfiles/oldcore/73/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/oldcore/73/update.sh
Simple merge
Timo's tree of IPFire 2.x