diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-02 09:07:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-02 09:07:34 +0200 |
| commit | caffc15f0b9e35698a6039fa3df2fa6a588608e6 (patch) | |
| tree | 61f42fb9479366667cd4d3629d1a0d28081a774c /libX11 | |
| parent | 22bc825e9931f718cc0564aa55915961abaffce4 (diff) | |
| parent | 9e382b6be0e81397f18ec0b733a2e88dc3465a33 (diff) | |
| download | vcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.tar.gz vcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.tar.bz2 vcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 2 Sep 2013
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index ab8237643..a741332dd 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -618,6 +618,10 @@ XCOMM Part 3 <Multi_key> <I> <quotedbl> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS <Multi_key> <diaeresis> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS <Multi_key> <I> <diaeresis> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS +<dead_acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <apostrophe> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <J> <apostrophe> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 <Multi_key> <J> <acute> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 <Multi_key> <D> <H> : "Ð" ETH # LATIN CAPITAL LETTER ETH <dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE @@ -739,6 +743,10 @@ XCOMM Part 3 <Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS <Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS <Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 <Multi_key> <j> <acute> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 <Multi_key> <d> <h> : "ð" eth # LATIN SMALL LETTER ETH <dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE |