diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-29 21:08:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-29 21:08:46 +0000 |
| commit | 432c39132c975e59fe4058ac615b07766c86007d (patch) | |
| tree | bdced6cb337b28fd9c546f41a3554e41b8b37046 /libX11/nls | |
| parent | 29990b52b9d48ba282da3c773a92316a33cc0b19 (diff) | |
| parent | 3f618a6c9607dfcffb2a4a870f8a5e0fc14106cb (diff) | |
| download | vcxsrv-432c39132c975e59fe4058ac615b07766c86007d.tar.gz vcxsrv-432c39132c975e59fe4058ac615b07766c86007d.tar.bz2 vcxsrv-432c39132c975e59fe4058ac615b07766c86007d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/nls')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index e26ef2be6..b850db1f8 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -104,6 +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> <o> <e> : "œ" oe # LATIN SMALL LIGATURE OE
<Multi_key> <O> <E> : "Œ" OE # LATIN CAPITAL LIGATURE OE
|