]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commitdiff
projects / people / jschlag / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c5c4f3 d7b82e7)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 11:11:17 +0000 (13:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 11:11:17 +0000 (13:11 +0200)
1  2 
config/rootfiles/oldcore/94/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/oldcore/94/update.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.