]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee732b2 45b6ea6)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 13 Aug 2015 13:13:22 +0000 (15:13 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 13 Aug 2015 13:13:22 +0000 (15:13 +0200)
1  2 
config/rootfiles/oldcore/93/update.sh patch | diff1 | diff2 | blob | history

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