libX11: Changes to 'master'

Tue Oct 4 14:20:00 PDT 2011

 nls/iso8859-1/Compose.pre |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f858f3326adbc0c5711669b92a64a84a9083a055
Author: James Cloos <cloos at jhcloos.com>
Date:   Tue Oct 4 17:11:11 2011 -0400

    [nls] Fix typo/synco.
    
    The iso8859-1 Compose table includes an optional section which uses
    Ctrl<T> as a substitute for <Multi_key>.  In that section the sequence
    to generate an @ (at) either was incorrectly copied from the Multi_key
    section or was not kept in sync with the Multi_key section.
    
    Fixing this eliminates the warning from compose-check.pl:
    
    â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”
    â”ƒ Clash with existing sequence in iso8859-1/Compose.pre
    â”ƒ  on line 661: Ctrl<T> <A> <A>
    â”ƒ    line #661: Ctrl<T> <A> <A>		: "\305"	Aring
    â”ƒ    line #480: Ctrl<T> <A> <A>		: "@"	at
    â”—â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”
    
    Signed-off-by: James Cloos <cloos at jhcloos.com>