diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-04 12:18:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-04 12:23:48 +0100 |
| commit | 45392e4a0642880b569ea5d4a350cdc395a2c7db (patch) | |
| tree | c3c2a49de903a18c3f8e1bf79684c29337ebcf7c /libX11/nls | |
| parent | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff) | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2 vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'libX11/nls')
| -rw-r--r-- | libX11/nls/km_KH.UTF-8/Compose.pre | 2 | ||||
| -rw-r--r-- | libX11/nls/sr_CS.UTF-8/Compose.pre | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libX11/nls/km_KH.UTF-8/Compose.pre b/libX11/nls/km_KH.UTF-8/Compose.pre index 77651d085..dc89119ae 100644 --- a/libX11/nls/km_KH.UTF-8/Compose.pre +++ b/libX11/nls/km_KH.UTF-8/Compose.pre @@ -1,6 +1,6 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" -# Khmer digraphs +XCOMM Khmer digraphs <U17ff> : "ាំ" <U17fe> : "ោះ" <U17fd> : "េះ" diff --git a/libX11/nls/sr_CS.UTF-8/Compose.pre b/libX11/nls/sr_CS.UTF-8/Compose.pre index 119e23ec4..b2397f7b3 100644 --- a/libX11/nls/sr_CS.UTF-8/Compose.pre +++ b/libX11/nls/sr_CS.UTF-8/Compose.pre @@ -1,17 +1,17 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" -# Serbian accented Cyrillic -# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A -# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E -# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O -# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U -# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I -# -# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> -# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> -# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> -# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute> -# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> +XCOMM Serbian accented Cyrillic +XCOMM а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A +XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E +XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O +XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U +XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I +XCOMM +XCOMM ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> +XCOMM ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> +XCOMM ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> +XCOMM ̏ - U+030F <dead_diaeresis>, <dead_doubleacute> +XCOMM ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> <dead_grave> <Cyrillic_a> : "а̀" <combining_grave> <Cyrillic_a> : "а̀" <Multi_key> <grave> <Cyrillic_a> : "а̀" @@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" <dead_grave> <Cyrillic_U> : "У̀" <combining_grave> <Cyrillic_U> : "У̀" <Multi_key> <grave> <Cyrillic_U> : "У̀" -# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> +XCOMM ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> <dead_acute> <Cyrillic_a> : "а́" <combining_acute> <Cyrillic_a> : "а́" <Multi_key> <acute> <Cyrillic_a> : "а́" @@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" <combining_acute> <Cyrillic_U> : "У́" <Multi_key> <acute> <Cyrillic_U> : "У́" <Multi_key> <apostrophe> <Cyrillic_U> : "У́" -# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> +XCOMM ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> <dead_circumflex> <Cyrillic_a> : "а̂" <Multi_key> <asciicircum> <Cyrillic_a> : "а̂" <dead_circumflex> <Cyrillic_A> : "А̂" @@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" <Multi_key> <asciicircum> <Cyrillic_u> : "у̂" <dead_circumflex> <Cyrillic_U> : "У̂" <Multi_key> <asciicircum> <Cyrillic_U> : "У̂" -# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> -# there's no appropriate dead_doublegrave, so we use these two dead keys +XCOMM ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> +XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys <dead_diaeresis> <Cyrillic_a> : "а̏" <dead_doubleacute> <Cyrillic_a> : "а̏" <dead_diaeresis> <Cyrillic_A> : "А̏" |