]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: beb37af 3855b7d)
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into mariadb mariadb_10.1.14
authorDaniel Weismüller <daniel.weismueller@ipfire.org>
Mon, 6 Jun 2016 08:27:25 +0000 (10:27 +0200)
committerDaniel Weismüller <daniel.weismueller@ipfire.org>
Mon, 6 Jun 2016 08:27:25 +0000 (10:27 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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