diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-29 15:44:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-29 15:44:00 +0200 |
| commit | 75b5635aa9e9791d10e3f63538e75237303ee6da (patch) | |
| tree | 3467c4f258773ec64aea7c4dda11b8574df9791f /xorg-server/xkeyboard-config | |
| parent | b2e1c9dff46fdf1b5936115531693981454ca466 (diff) | |
| parent | 1ccf18dc09e288ddf937aa890b50c8d0a9df4319 (diff) | |
| download | vcxsrv-75b5635aa9e9791d10e3f63538e75237303ee6da.tar.gz vcxsrv-75b5635aa9e9791d10e3f63538e75237303ee6da.tar.bz2 vcxsrv-75b5635aa9e9791d10e3f63538e75237303ee6da.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/libX11/CH08.xml
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/queryobj.c
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_readpixels.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mkfontscale/list.h
pixman/pixman/Makefile.win32
xorg-server/dix/devices.c
xorg-server/dix/events.c
xorg-server/dix/inpututils.c
xorg-server/fb/fbbltone.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xfree86/common/xf86Module.h
xorg-server/hw/xfree86/common/xf86Xinput.c
xorg-server/hw/xfree86/man/xorg.conf.man
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winmouse.c
xorg-server/include/input.h
xorg-server/include/inputstr.h
xorg-server/mi/mieq.c
xorg-server/randr/rrscreen.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/base.xml.in
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 12 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 74adfde49..b2c8e40b8 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -191,6 +191,16 @@ <variantList>
<variant>
<configItem>
+ <name>crh_dobruja</name>
+ <_shortDescription>crh</_shortDescription>
+ <_description>Crimean Tatar (Dobruja Q)</_description>
+ <languageList>
+ <iso639Id>crh</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>ergonomic</name>
<_description>Romanian (ergonomic Touchtype)</_description>
</configItem>
@@ -252,7 +262,7 @@ <variant>
<configItem>
<name>olpc-phonetic</name>
- <_description>Armenian (alternative phonetic for OLPC)</_description>
+ <_description>Armenian (OLPC phonetic)</_description>
</configItem>
</variant>
</variantList>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 0b180311e..7bfbb17f0 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -3891,16 +3891,6 @@ <_description>Romanian (WinKeys)</_description>
</configItem>
</variant>
- <variant>
- <configItem>
- <name>crh_dobruja</name>
- <_shortDescription>crh</_shortDescription>
- <_description>Crimean Tatar (Dobruja Q)</_description>
- <languageList>
- <iso639Id>crh</iso639Id>
- </languageList>
- </configItem>
- </variant>
</variantList>
</layout>
<layout>
|