]> 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: 8667a65 405d20b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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