]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95b09c8 55eb745)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:42:57 +0000 (18:42 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:42:57 +0000 (18:42 +0200)
1  2 
config/rootfiles/oldcore/94/update.sh patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/oldcore/94/update.sh
Simple merge
diff --cc make.sh
Simple merge
IPFire 2.x development tree