]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit - langs/de/cgi-bin/de.pl
Forward Firewall: applied all changes as diff and added new files. Also deleted c...
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Aug 2013 12:02:02 +0000 (14:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Aug 2013 12:02:02 +0000 (14:02 +0200)
commit111c99ddfa3632a8c2788b9c6d70c5e6d8a1dfd4
treeff58b6268bd67c66048a47bec7c410afaa0af6cf
parent7323724196db7b63d83bea9774e2b1356b1854aa
Forward Firewall: applied all changes as diff and added new files. Also deleted c files from xtaccess and setdmzholes.

Signed-off-by: Alexander Marx <amarx@ipfire.org>
Conflicts:
config/backup/include
lfs/configroot
lfs/usb-stick
15 files changed:
config/backup/include
config/cfgroot/general-functions.pl
config/menu/50-firewall.menu
config/rootfiles/common/configroot
config/rootfiles/common/i586/initscripts
config/rootfiles/common/misc-progs
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/configroot
lfs/initscripts
src/initscripts/init.d/firewall
src/initscripts/init.d/network
src/misc-progs/Makefile
src/misc-progs/setdmzholes.c [deleted file]
src/misc-progs/setxtaccess.c [deleted file]