Merge remote-tracking branch 'origin/released'

* origin/released:
  git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

1 files changed, 18 insertions, 25 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index dc101bc22..b302f5e71 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -3,13 +3,11 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a Lao keyboard
-    // This keymap uses the Lao keyboard standard [kind of] widely used inLaos
+    // This keymap describes the Lao keyboard standard,
+    // which is [kind of] widely used in Laos.
 
     name[Group1]= "Lao";
 
-    // Alphanumeric section
     key <TLDE> { [ 0x100200D			]};
     key <AE01> { [ 0x1000ea2,       0x1000ed1	]};
     key <AE01> { [ 0x1000ea2,       0x1000ed1	]};
@@ -37,7 +35,7 @@ xkb_symbols "basic" {
     key <AD10> { [ 0x1000e8d,       0x1000ebd	]};
     key <AD11> { [ 0x1000e9a,       minus	]};
     key <AD12> { [ 0x1000ea5,       braceright	]};
-    key <BKSL> { [ 0x1000edc,      0x1000edd	]};
+    key <BKSL> { [ 0x1000edc,       0x1000edd	]};
 
     key <AC01> { [ 0x1000eb1			]};
     key <AC02> { [ 0x1000eab,       semicolon	]};
@@ -61,27 +59,23 @@ xkb_symbols "basic" {
     key <AB08> { [ 0x1000ea1,       grave	]};
     key <AB09> { [ 0x1000ec3,       dollar	]};
     key <AB10> { [ 0x1000e9d,       parenright	]};
-
 };
 
+
 partial
 xkb_symbols "stea" {
 
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a Lao keyboard
-    // This keymap uses the proposed Lao keyboard standard by the
-    // PAN Localization Project
+    // This keymap describes the proposed Lao keyboard standard by
+    // the PAN Localization Project.
     // Science Technology and Environment Agency of Lao PDR
     // National University Computer and Emergency Science of Pakistan
     // International Development Research Center
-    // Caveat: assigning multiple codepoints to a single key doesn't 
-    // work in XKB. Therefor the combining codepoint assignments
+    // Caveat: assigning multiple codepoints to a single key doesn't
+    // work in XKB.  Therefore the combining codepoint assignments
     // have been omitted.
 
-
     name[Group1]= "Lao (STEA proposed standard layout)";
 
-    // Alphanumeric section
     key <TLDE> { [  quotedbl,      apostrophe           	]};
     key <AE01> { [ 0x1000ea2,               1,       0x1000ed1	]};
     key <AE02> { [ 0x1000e9f,               2,       0x1000ed2	]};
@@ -94,23 +88,23 @@ xkb_symbols "stea" {
     key <AE09> { [ 0x1000e88,               7,       0x1000ed9	]};
     key <AE10> { [ 0x1000e82,               8,       0x1000ed0	]};
     key <AE11> { [ 0x1000e8a,               9			]};
-    key <AE12> { [ 0x1000ecd 		]};
+    key <AE12> { [ 0x1000ecd 					]};
 
-    key <AD01> { [ 0x1000ebb		]};
+    key <AD01> { [ 0x1000ebb					]};
     key <AD02> { [ 0x1000ec4,               0			]};
     key <AD03> { [ 0x1000eb3,       asterisk			]};
     key <AD04> { [ 0x1000e9e,       underscore             	]};
     key <AD05> { [ 0x1000eb0,       plus                	]};
-    key <AD06> { [ 0x1000eb4		]};
-    key <AD07> { [ 0x1000eb5		]};
+    key <AD06> { [ 0x1000eb4					]};
+    key <AD07> { [ 0x1000eb5					]};
     key <AD08> { [ 0x1000eae,       0x1000ea3	                ]};
     key <AD09> { [ 0x1000e99,       0x1000edc			]};
-    key <AD10> { [ 0x1000e8d,       0x1000ebd	]};
-    key <AD11> { [ 0x1000e9a,       minus	]};
-    key <AD12> { [ 0x1000ea5        	]};
+    key <AD10> { [ 0x1000e8d,       0x1000ebd			]};
+    key <AD11> { [ 0x1000e9a,       minus			]};
+    key <AD12> { [ 0x1000ea5        				]};
     key <BKSL> { [     slash,       backslash	                ]};
 
-    key <AC01> { [ 0x1000eb1		]};
+    key <AC01> { [ 0x1000eb1        		]};
     key <AC02> { [ 0x1000eab,       semicolon	]};
     key <AC03> { [ 0x1000e81,       period	]};
     key <AC04> { [ 0x1000e94,       comma	]};
@@ -126,8 +120,8 @@ xkb_symbols "stea" {
     key <AB02> { [ 0x1000e9b,       parenleft	]};
     key <AB03> { [ 0x1000ec1,       0x1000eaf	]};
     key <AB04> { [ 0x1000ead,       x		]};
-    key <AB05> { [ 0x1000eb6		]};
-    key <AB06> { [ 0x1000eb7		]};
+    key <AB05> { [ 0x1000eb6			]};
+    key <AB06> { [ 0x1000eb7			]};
     key <AB07> { [ 0x1000e97,       0x1000ec6	]};
     key <AB08> { [ 0x1000ea1,       0x1000edd	]};
     key <AB09> { [ 0x1000ec3,       dollar	]};
@@ -138,5 +132,4 @@ xkb_symbols "stea" {
     key <KPDL> { [     comma,       period 			]};
 
     include "level3(ralt_switch)"
-
 };