svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 5 insertions, 15 deletions

diff --git a/xorg-server/xkbdata.src/symbols/si b/xorg-server/xkbdata.src/symbols/si
index 8e49cac51..ced6d2fe7 100644
--- a/xorg-server/xkbdata.src/symbols/si
+++ b/xorg-server/xkbdata.src/symbols/si
@@ -7,6 +7,8 @@ xkb_symbols "basic" {
     name[Group1]="Slovenia";
 
     include "rs(latin)"
+
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 partial alphanumeric_keys 
@@ -15,6 +17,8 @@ xkb_symbols "us" {
     name[Group1]= "Slovenia - US keyboard with Slovenian letters";
 
     include "rs(latinyz)"
+
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 
@@ -24,20 +28,6 @@ xkb_symbols "alternatequotes" {
     name[Group1]= "Slovenia - Use guillemets for quotes";
 
     include "rs(latinalternatequotes)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "unicode" {
-
-    name[Group1]= "Slovenia - Use Slovenian digraphs";
-
-    include "rs(latinunicode)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "unicodeus" {
-
-    name[Group1]= "Slovenia - US keyboard with Slovenian digraphs";
 
-    include "rs(latinunicodeyz)"
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };