]> 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: 7284262 4accbf9)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 15 Sep 2013 16:42:33 +0000 (18:42 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 15 Sep 2013 16:42:33 +0000 (18:42 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Peter's tree of IPFire 2.x