Tom Eastep bb538a7c10 Merge branch 'master' into 5.0.0 ... Conflicts: Shorewall-core/lib.common Shorewall-core/shorewallrc.debian.systemd Shorewall-lite/shorewall-lite.service.debian Shorewall/Perl/Shorewall/Chains.pm Shorewall/Perl/Shorewall/Compiler.pm Shorewall/Perl/Shorewall/Config.pm Shorewall/Perl/Shorewall/Misc.pm Shorewall/Perl/Shorewall/Raw.pm Shorewall/Perl/Shorewall/Tc.pm Shorewall/Perl/compiler.pl Shorewall/Perl/prog.footer Shorewall/lib.cli-std Shorewall/manpages/shorewall-mangle.xml Shorewall/manpages/shorewall.conf.xml Shorewall/manpages/shorewall.xml Shorewall/shorewall.service.debian Shorewall6-lite/shorewall6-lite.service.debian Shorewall6/manpages/shorewall6-mangle.xml Shorewall6/manpages/shorewall6.conf.xml Shorewall6/manpages/shorewall6.xml Shorewall6/shorewall6.service.debian docs/MultiISP.xml docs/Shorewall_Squid_Usage.xml		2015-10-12 10:55:36 -07:00
..
Shorewall	Merge branch 'master' into 5.0.0	2015-10-12 10:55:36 -07:00
compiler.pl	Remove all of the update-specific options from the update command	2015-08-31 14:21:41 -07:00
getparams	Change license to GPLv2+ and update copyrights	2014-01-04 09:48:27 -08:00
lib.core	Use %e rather than %_d for busybox compatibility	2015-10-08 13:16:32 -07:00
prog.footer	Correct handling of reset	2015-09-11 15:02:32 -07:00