Merge remote branch 'upstream/master'

Conflicts: package/yast2.changes
yast · Aug 3, 2012 · 7835db8 · 7835db8
2 parents 818b09a + ea9dc35
commit 7835db8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/data/sysconfig.yast2 b/data/sysconfig.yast2
@@ -22,13 +22,15 @@ WANTED_SHELL="auto"
 #       qt rendering if gtk is not present
 WANTED_GUI="auto"
 
-## Type: string(linux,xterm,rxvt,mono,braille)
+## Type: string(linux,xterm,rxvt,mono,inverted,highcontrast,braille)
 ## Default: ""
 # Color theme for YaST ncurses UI
 # xterm: blue-white-red
 # linux: blue-white-yellow
 # rxvt: black-yellow-red
 # mono: white-black
+# inverted: black-white
+# highcontrast: lightgrey-black
 # braille: for visually impaired
 Y2NCURSES_COLOR_THEME=""
 

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 26 11:45:26 CEST 2012 - gs@suse.de
+
+- added color schemes "highcontrast" and "inverted" to description
+  of Y2NCURSES_COLOR_THEME in sysconfig.yast2 
+
 -------------------------------------------------------------------
 Fri Jun 22 11:25:10 UTC 2012 - tgoettlicher@suse.de