]> 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: dadfa43 38c6822)
Merge branch 'install-raid' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 21:39:20 +0000 (23:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 21:39:20 +0000 (23:39 +0200)
Conflicts:
make.sh

1  2 
doc/language_missings patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

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