Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

This commit is contained in:
Christian Schmidt
2011-07-06 19:30:11 +02:00
7 changed files with 9 additions and 7 deletions

View File

@@ -3,6 +3,7 @@ var/ipfire/langs/
etc/rc.d/init.d/console
usr/local/sbin/setup
var/ipfire/graphs.pl
srv/web/ipfire/cgi-bin/portfw.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
usr/local/share/GeoIP/GeoIP.dat
usr/share/hwdata/pci.ids

View File

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