libX11: Changes to 'libX11-1.1-branch'

[James Cloos]

 nls/en_US.UTF-8/Compose.pre |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a69d85b7f6901cc791cd1f5becadfed893d6726b
Author: James Cloos <cloos at jhcloos.com>
Date:   Wed Aug 20 15:27:44 2008 -0400

    nls (en_US) Re-remove long compositions that override shorter
    
    As reported in <https://bugs.freedesktop.org/show_bug.cgi?id=17228>:
    
      Commit a6f4bbf7
        nls (en_US): remove long compositions that override shorter [...]
        removed some longer compose sequences because there are shorter
        ones which take preference over the longer. For example the
        sequences:
    
          <Multi_key> <apostrophe> <comma> <c>   : U1E09 # ḉ
          <Multi_key> <apostrophe> <comma> <C>   : U1E08 # Ḉ
    
        were removed becase there already was:
    
          <Multi_key> <apostrophe> <comma>       : U201A # ‚
    
      Then commit 4ba09125
        Work on making the en_US and pt_BR UTF-8 Compose as similar as
        possible added exactly the same key sequences again. Obviusly
        they won't work.
    (cherry picked from commit a788792e9de95f8db0639557859722a35087481d)
    
    Signed-off-by: James Cloos <cloos at jhcloos.com>