Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
This commit is contained in:
Arne Fitzenreiter
2010-08-18 21:54:42 +02:00
4 changed files with 9 additions and 9 deletions

View File

@@ -10,15 +10,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.1.3
usr/lib/libclamav.so.6.1.4
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.1.3
usr/lib/libclamunrar.so.6.1.4
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.1.3
usr/lib/libclamunrar_iface.so.6.1.4
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav