]> 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: 544f40d 7837dad)
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Aug 2012 16:24:16 +0000 (12:24 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Aug 2012 16:24:16 +0000 (12:24 -0400)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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