From d26ea2f474c48afa7d3c261572da5d85b7b62bd8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 23 Apr 2014 22:41:48 +0200
Subject: fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr
 2014

xserver          commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1
xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad
pixman           commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468
fontconfig       commit 81664fe54f117e4781fda5a30429b51858302e91
mesa             commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
---
 xorg-server/xkeyboard-config/symbols/ru | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols/ru')

diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 2b34a4d52..fd1cc0ec5 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -182,7 +182,7 @@ xkb_symbols "phonetic" {
     key <LatA> { [        Cyrillic_a,        Cyrillic_A  ] };
     key <LatW> { [       Cyrillic_ve,       Cyrillic_VE  ] };
     key <LatC> { [      Cyrillic_tse,      Cyrillic_TSE  ] };
-    key <LatX> { [       Cyrillic_ha,       Cyrillic_HA  ] };
+    key <LatX> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN  ] };
     key <LatD> { [       Cyrillic_de,       Cyrillic_DE  ] };
     key <LatE> { [       Cyrillic_ie,       Cyrillic_IE  ] };
     key <LatV> { [      Cyrillic_zhe,      Cyrillic_ZHE  ] };
@@ -191,7 +191,7 @@ xkb_symbols "phonetic" {
     key <LatR> { [       Cyrillic_er,       Cyrillic_ER  ] };
     key <LatN> { [       Cyrillic_en,       Cyrillic_EN  ] };
     key <LatB> { [       Cyrillic_be,       Cyrillic_BE  ] };
-    key <LatH> { [      Cyrillic_che,      Cyrillic_CHE  ] };
+    key <LatH> { [       Cyrillic_ha,       Cyrillic_HA  ] };
     key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE  ] };
     key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU  ] };
     key <LatM> { [       Cyrillic_em,       Cyrillic_EM  ] };
@@ -204,7 +204,7 @@ xkb_symbols "phonetic" {
     key <LatP> { [       Cyrillic_pe,       Cyrillic_PE  ] };
 
     key <AD11> { [      Cyrillic_sha,      Cyrillic_SHA  ] };
-    key <AE12> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN  ] };
+    key <AE12> { [      Cyrillic_che,      Cyrillic_CHE  ] };
     key <AD12> { [    Cyrillic_shcha,    Cyrillic_SHCHA  ] };
     key <BKSL> { [        Cyrillic_e,        Cyrillic_E  ] };
 };
@@ -268,10 +268,10 @@ xkb_symbols "cv" {
 
     key.type[group1]="FOUR_LEVEL";
 
-    key <AD03> { [   Cyrillic_u,   Cyrillic_U,  U04F3,  U04F2  ] };
-    key <AD05> { [  Cyrillic_ie,  Cyrillic_IE,  U04D7,  U04D6  ] };
-    key <AC04> { [   Cyrillic_a,   Cyrillic_A,  U04D1,  U04D0  ] };
-    key <AB03> { [  Cyrillic_es,  Cyrillic_ES,  U04AB,  U04AA  ] };
+    key <AD03> { [   Cyrillic_u,   Cyrillic_U,  0x010004f3,  0x010004f2 ] };
+    key <AD05> { [  Cyrillic_ie,  Cyrillic_IE,  0x010004d7,  0x010004d6 ] };
+    key <AC04> { [   Cyrillic_a,   Cyrillic_A,  0x010004d1,  0x010004d0 ] };
+    key <AB03> { [  Cyrillic_es,  Cyrillic_ES,  0x010004ab,  0x010004aa ] };
 
     include "level3(ralt_switch)"
 };
-- 
cgit v1.2.3