Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Michael Tremer
2010-06-01 23:55:33 +02:00
2 changed files with 16 additions and 0 deletions

View File

@@ -1,4 +1,13 @@
etc/system-release
etc/e2fsck.conf
etc/httpd/conf/vhosts.d/ipfire-interface.conf
etc/rc.d/init.d/leds
etc/rc.d/init.d/snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc3.d/S21leds
etc/rc.d/rc6.d/K79leds
etc/udev/rules.d/52-nut-usbups.rules
etc/udev/rules.d/xpp.rules
var/ipfire/backup/bin/backup.pl
var/ipfire/header.pl
var/ipfire/menu.d/50-firewall.menu
@@ -14,7 +23,13 @@ srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/iptables.cgi
srv/web/ipfire/cgi-bin/logs.cgi/config.dat
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/time.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl

View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch