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

Conflicts:
	config/rootfiles/core/49/filelists/files
This commit is contained in:
Arne Fitzenreiter
2011-04-10 10:39:08 +02:00
9 changed files with 29 additions and 92 deletions

View File

@@ -1 +1,11 @@
etc/system-release
etc/init.d/squid
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl

View File

@@ -0,0 +1 @@
../../../common/ntfs-3g

View File

@@ -44,7 +44,7 @@ extract_files
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod 2.6.32.28-ipfire >/dev/null 2>&1