Merge branch 'master' into kernel36

Conflicts:
	config/rootfiles/common/Mail-Tools
This commit is contained in:
Arne Fitzenreiter
2011-04-10 10:44:33 +02:00
31 changed files with 159 additions and 467 deletions

View File

@@ -25,7 +25,7 @@ usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/qmail.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/rfc822.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/sendmail.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtps.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtps.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Send.pod

View File

@@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
usr/lib/libsensors.so.4.2.1
usr/lib/libsensors.so.4.3.1
#usr/man/man1/sensors.1
#usr/man/man3
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
#usr/man/man5/sensors3.conf.5

View File

@@ -1,14 +1,19 @@
bin/lowntfs-3g
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.54
lib/libntfs-3g.so.54.0.0
lib/libntfs-3g.so.80
lib/libntfs-3g.so.80.0.0
sbin/mount.lowntfs-3g
sbin/mount.ntfs-3g
usr/bin/ntfs-3g.probe
usr/bin/ntfs-3g.secaudit
usr/bin/ntfs-3g.usermap
#usr/include/ntfs-3g
#usr/include/ntfs-3g/attrib.h
#usr/include/ntfs-3g/attrlist.h
#usr/include/ntfs-3g/bitmap.h
#usr/include/ntfs-3g/bootsect.h
#usr/include/ntfs-3g/cache.h
#usr/include/ntfs-3g/collate.h
#usr/include/ntfs-3g/compat.h
#usr/include/ntfs-3g/compress.h
@@ -16,6 +21,7 @@ usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g/device.h
#usr/include/ntfs-3g/device_io.h
#usr/include/ntfs-3g/dir.h
#usr/include/ntfs-3g/efs.h
#usr/include/ntfs-3g/endians.h
#usr/include/ntfs-3g/index.h
#usr/include/ntfs-3g/inode.h
@@ -27,6 +33,9 @@ usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g/misc.h
#usr/include/ntfs-3g/mst.h
#usr/include/ntfs-3g/ntfstime.h
#usr/include/ntfs-3g/object_id.h
#usr/include/ntfs-3g/param.h
#usr/include/ntfs-3g/reparse.h
#usr/include/ntfs-3g/runlist.h
#usr/include/ntfs-3g/security.h
#usr/include/ntfs-3g/support.h
@@ -34,12 +43,16 @@ usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g/unistr.h
#usr/include/ntfs-3g/version.h
#usr/include/ntfs-3g/volume.h
#usr/include/ntfs-3g/xattrs.h
#usr/lib/libntfs-3g.a
#usr/lib/libntfs-3g.la
usr/lib/libntfs-3g.so
usr/lib/pkgconfig/libntfs-3g.pc
#usr/share/doc/ntfs-3g
#usr/share/doc/ntfs-3g/README
#usr/share/man/man8/mount.lowntfs-3g.8
#usr/share/man/man8/mount.ntfs-3g.8
#usr/share/man/man8/ntfs-3g.8
#usr/share/man/man8/ntfs-3g.probe.8
#usr/share/man/man8/ntfs-3g.secaudit.8
#usr/share/man/man8/ntfs-3g.usermap.8