aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.extras.xml.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-22 14:27:38 +0100
committermarha <marha@users.sourceforge.net>2013-01-22 14:27:38 +0100
commit7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch)
tree2fbbd202a6a4243f0e64a8b22e22417a609ae19d /xorg-server/xkeyboard-config/rules/base.extras.xml.in
parent50c07563e17397daf040a32d8fdd3ab397e72371 (diff)
parent470f7ca9f0be348faf2f03fc16811844c5eeffce (diff)
downloadvcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz
vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2
vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.extras.xml.in')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 1614eec96..cec043f67 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -462,7 +462,7 @@
<variant>
<configItem>
<name>sun_type6</name>
- <_description>Portuguese (Brazil,Sun Type 6/7)</_description>
+ <_description>Portuguese (Brazil, Sun Type 6/7)</_description>
</configItem>
</variant>
</variantList>
@@ -693,7 +693,7 @@
<configItem>
<name>ch</name>
<_shortDescription>de</_shortDescription>
- <_description>>German (Switzerland)</_description>
+ <_description>German (Switzerland)</_description>
</configItem>
<variantList>
<variant>