Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / doc / packages-list.txt

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b21bce4e68afb9e0f5190beb4ae7ddafbacc632a..ee2467a661e60ca899b2f48244b6bad73ef661e8 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -74,7 +74,7 @@
 * cpufrequtils-007
 * cryptodev-20091126-kmod-2.6.32.21-ipfire
 * cryptodev-20091126-kmod-2.6.32.21-ipfire-xen
 * cpufrequtils-007
 * cryptodev-20091126-kmod-2.6.32.21-ipfire
 * cryptodev-20091126-kmod-2.6.32.21-ipfire-xen

-* cups-1.4.2
+* cups-1.4.4

 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21


@@ -140,7 +140,7 @@
 * hdparm-8.9
 * hostapd-0.7.3
 * hplip-2.7.10
 * hdparm-8.9
 * hostapd-0.7.3
 * hplip-2.7.10

-* htop-0.8.1
+* htop-0.8.3

 * httpd-2.2.15
 * hwdata
 * iana-etc-2.10
 * httpd-2.2.15
 * hwdata
 * iana-etc-2.10


@@ -299,7 +299,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6

-* samba-3.5.4
+* samba-3.5.5

 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01