diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
| commit | 6f066fc9e28c33779b89e7e48e6437965dde9b77 (patch) | |
| tree | b2b9767762bd559d1edd808820cb65a4e3330397 /libX11/nls | |
| parent | 1b73fdf9c9aa2330380300d204fb47f512cfb6e2 (diff) | |
| parent | 5fb4fb602bde5140dcea45464e3b70a49078ad2e (diff) | |
| download | vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.gz vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.bz2 vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11/nls')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index b8cb4f7cd..057f6217a 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -104,7 +104,7 @@ XCOMM Spaces <Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE <Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE <Multi_key> <s> <s> : "ß" ssharp # LATIN SMALL LETTER SHARP S -<Multi_key> <S> <S> : "ẞ" Ssharp # LATIN CAPITAL LETTER SHARP S +<Multi_key> <S> <S> : "ẞ" U1e9e # LATIN CAPITAL LETTER SHARP S <Multi_key> <o> <e> : "œ" oe # LATIN SMALL LIGATURE OE <Multi_key> <O> <E> : "Œ" OE # LATIN CAPITAL LIGATURE OE |