From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 7 Feb 2014 23:28:38 +0100
Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb
 mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
---
 xorg-server/xkeyboard-config/symbols/jp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 52f574623..f0b2c4d75 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -243,8 +243,8 @@ xkb_symbols "nicola_f_bs" {
 // Copied from macintosh_vndr/jp
 partial alphanumeric_keys
 xkb_symbols "mac" {
-    name[Group1]= "Japanese (Macintosh)";
     include "jp(kana)"
+    name[Group1]= "Japanese (Macintosh)";
 
     replace key <CAPS> { [ Caps_Lock ] };
 };
@@ -256,8 +256,8 @@ xkb_symbols "hztg_escape" {
 
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    name[Group1]= "Japanese (Dvorak)";
     include "jp(OADG109A)"
+    name[Group1]= "Japanese (Dvorak)";
 
     key <AE11> { [ at, grave		] };
 
-- 
cgit v1.2.3