]> 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: 9ac9fc3 65418d1)
Merge branch 'asterisk-update' into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 09:07:58 +0000 (11:07 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 09:07:58 +0000 (11:07 +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
Peter's tree of IPFire 2.x