]> 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: b76a037 7b6d7c6)
Merge branch 'seventeen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Nov 2014 08:38:23 +0000 (09:38 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Nov 2014 08:38:23 +0000 (09:38 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree