]> 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: 14a08a8 5ab875a)
Merge remote-tracking branch 'ummeegge/lynis' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:49:36 +0000 (22:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:49:36 +0000 (22:49 +0100)
Conflicts:
make.sh

1  2 
lfs/squid-accounting patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history
src/squid-accounting/acct-lib.pl patch | diff1 | diff2 | blob | history

diff --cc lfs/squid-accounting
Simple merge
diff --cc make.sh
Simple merge
diff --cc src/squid-accounting/acct-lib.pl
Simple merge
IPFire 2.x development tree