]> 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: 65418d1 10cd52b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Sun, 27 Jul 2014 20:35:56 +0000 (22:35 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sun, 27 Jul 2014 20:35:56 +0000 (22:35 +0200)
Conflicts:
config/etc/logrotate.conf
config/rootfiles/packages/asterisk

1  2 
make.sh patch | diff1 | diff2 | blob | history

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