]> 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: 15b470a 8015910)
Merge remote-tracking branch 'glotzi/monit' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:10:47 +0000 (23:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:10:47 +0000 (23:10 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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