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

This commit is contained in:
Arne Fitzenreiter
2010-12-07 18:31:27 +01:00
3 changed files with 3 additions and 1 deletions

View File

@@ -773,7 +773,7 @@ sub updatehwtempgraph {
"-w 600",
"-h 125",
"-r",
"-t ".$Lang::tr{'sensors temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},

View File

@@ -4,3 +4,4 @@ etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
var/updatecache
etc/snort/snort.conf

View File

@@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/html/images/urlfilter/copy.gif
var/ipfire/general-functions.pl
var/ipfire/graphs.pl
var/ipfire/extrahd/bin/extrahd.pl
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl