libX11: Changes to 'master'

[James Cloos]

Nuts.  I thought all of those were sorted already.

The dstroke and Dstroke lines are arguably better than the U0110 and
U0111 lines.

Since <Multi_key> <o> <apostrophe> <a> and <A> were already there,
the <Multi_key> <o> <apostrophe> entry for ó will have to go.

So I'll push this:

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 1f72ae2..2eae912 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -650 +649,0 @@ XCOMM Part 3
-<Multi_key> <O> <apostrophe>           : "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
@@ -776 +774,0 @@ XCOMM Part 3
-<Multi_key> <o> <apostrophe>           : "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
@@ -881,6 +878,0 @@ XCOMM Part 3
-<dead_stroke> <D>                      : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <slash> <D>                : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <D>            : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<dead_stroke> <d>                      : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <slash> <d>                : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <d>            : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE

-JimC
-- 
James Cloos <cloos at jhcloos.com>         OpenPGP: 1024D/ED7DAEA6