svn merge ^/branches/released

1 files changed, 9 insertions, 1 deletions

diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkbdata.src/symbols/ch
index 3a7646f80..a0a2621a9 100644
--- a/xorg-server/xkbdata.src/symbols/ch
+++ b/xorg-server/xkbdata.src/symbols/ch
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
     key <AE04> { [          4,   ccedilla                           ] };
     key <AE05> { [          5,    percent                           ] };
     key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE07> { [          7,      slash,          bar             ] };
     key <AE08> { [          8,  parenleft,         cent             ] };
     key <AE09> { [          9, parenright                           ] };
     key <AE10> { [          0,      equal                           ] };
@@ -42,6 +42,14 @@ xkb_symbols "basic" {
 };
 
 partial alphanumeric_keys 
+xkb_symbols "legacy" {
+    include "ch(basic)"
+
+    name[Group1]= "Switzerland - Legacy";
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+};
+
+partial alphanumeric_keys 
 xkb_symbols "de" {
     include "ch(basic)"
 };