]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f379cee 2f075ff)
Merge remote-tracking branch 'origin/master' into core89
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 15:52:57 +0000 (17:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 15:52:57 +0000 (17:52 +0200)
1  2 
config/rootfiles/core/89/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/core/89/update.sh
Simple merge
Stefan's tree of IPFire 2.x.