Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2010-08-04 21:20:10 +02:00
7 changed files with 29 additions and 29 deletions

View File

@@ -4,7 +4,9 @@ var/ipfire/langs/de.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/dhcp/dhcpd.conf.local
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/functions
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/time.cgi
usr/lib/python2.7/ipaddr.pyc
usr/lib/python2.7/site-packages/drv_libxml2.py
@@ -12,3 +14,5 @@ usr/lib/python2.7/site-packages/libxml2.py
usr/lib/python2.7/site-packages/libxml2mod.so
usr/lib/python2.7/site-packages/libxml2.pyc
usr/lib/python2.7/site-packages/libxsltmod.so
lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko