Merge branch 'master' into kernel38

This commit is contained in:
Arne Fitzenreiter
2011-04-17 23:15:38 +02:00
21 changed files with 83 additions and 4 deletions

View File

@@ -1,6 +1,9 @@
etc/system-release
etc/init.d/squid
etc/rc.d/init.d/squid
etc/rc.d/init.d/waitdrives
etc/rc.d/rcsysinit.d/S19waitdrives
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
@@ -9,3 +12,4 @@ var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
usr/local/bin/scanhd

View File

@@ -0,0 +1,13 @@
srv/web/ipfire/html/images/delete.gif
srv/web/ipfire/html/images/document-save.png
srv/web/ipfire/html/images/edit.gif
srv/web/ipfire/html/images/floppy.gif
srv/web/ipfire/html/images/forward.gif
srv/web/ipfire/html/images/info.gif
srv/web/ipfire/html/images/list-add.png
srv/web/ipfire/html/images/list-remove.png
srv/web/ipfire/html/images/package-x-generic.png
srv/web/ipfire/html/images/reload.gif
srv/web/ipfire/html/images/stock_ok.png
srv/web/ipfire/html/images/stock_stop.png
srv/web/ipfire/html/images/user-trash.png