xserver: Branch 'master'

[Jon TURNEY]

 hw/xwin/winlayouts.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10dcf3ed9c543a6811340567e586ec0e476fcf61
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Feb 20 15:22:35 2009 +0000

    Cygwin/X: Fix keyboard layout mapping for Latin American keyboards
    
    Fix keyboard layout mapping table entry for Windows keyboard layout 0x80a
    (Latin American), layout should (now) be 'latam', not 'la' which is Laos
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/winlayouts.h b/hw/xwin/winlayouts.h
index dabd5e0..1fd3457 100644
--- a/hw/xwin/winlayouts.h
+++ b/hw/xwin/winlayouts.h
@@ -57,7 +57,7 @@ WinKBLayoutRec winKBLayouts[] =
     {  0x809, -1, "pc105", "gb",      NULL, NULL, "English (United Kingdom)"},
     { 0x1809, -1, "pc105", "ie",      NULL, NULL, "Irish"},
     {  0x40a, -1, "pc105", "es",      NULL, NULL, "Spanish (Spain, Traditional Sort)"},
-    {  0x80a, -1, "pc105", "la",      NULL, NULL, "Latin American"},
+    {  0x80a, -1, "pc105", "latam",   NULL, NULL, "Latin American"},
     {  0x40b, -1, "pc105", "fi",      NULL, NULL, "Finnish"},
     {  0x40c, -1, "pc105", "fr",      NULL, NULL, "French (Standard)"},
     {  0x80c, -1, "pc105", "be",      NULL, NULL, "French (Belgian)"},