]> 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: 6047b2c e3b5a05)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Sat, 17 May 2014 16:43:00 +0000 (18:43 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sat, 17 May 2014 16:43:00 +0000 (18:43 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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