]> 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: 500f7b4 1913c6a)
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@git.ipfire.org>
Tue, 9 Oct 2012 18:35:44 +0000 (20:35 +0200)
committerArne Fitzenreiter <arne_f@git.ipfire.org>
Tue, 9 Oct 2012 18:35:44 +0000 (20:35 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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