]> 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: 0e9017c d9edbc1)
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 13:07:37 +0000 (15:07 +0200)
committerArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 13:07:37 +0000 (15:07 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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