summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator_consts.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Xconfigurator_consts.pm')
-rw-r--r--perl-install/Xconfigurator_consts.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 258f7c882..1f7529164 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -2,7 +2,7 @@ use common qw(:common);
%depths = (
8 => __("256 colors"),
-# 15 => __("32 thousand colors"),
+#- 15 => __("32 thousand colors"),
16 => __("65 thousand colors"),
24 => __("16 million colors"),
32 => __("4 billion colors"),
@@ -41,7 +41,7 @@ $resolution_wanted = "1024x768";
__("Monitor that can do 1600x1200 at 76 Hz") => [ '1600x1200@76', "31.5-94.0" , "50-160" ],
);
-# * Screen/video card configuration.
+#- * Screen/video card configuration.
%ramdacs = (
__("No RAMDAC Setting (recommended)") => '',
__("AT&T 20C490 (S3 and AGX servers, ARK driver)"), => 'att20c490',
ry='diff' class='diff'>
diff --git a/images/NEWS b/images/NEWS
index 60b7e189a..19e68e77f 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,12 @@
+- sync with kernel-3.2.0-0.rc7.1.mga2
+ * add wireless drivers:
+ at76c50x_usb, ath9k_htc, brcmfmac, i2400m_usb, orinoco_usb,
+ rtl8187, usb8xxx
+ * add usb network adapters:
+ dm9601, smsc75xx, smsc95xx
+ * add network drivers:
+ cxgb4, myri10ge
+
Version 1.58 - 24 October 2011 by Thierry Vignaud
- include nilfs2 module (#3807)