Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa xkeyboard-config xserver git update 15 jan 2014
  randrproto libfontenc mesa xserver git update 10 Jan 2014
  randsrproto fontconfig libX11 git update 6 Jan 2014

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp
	mesalib/src/glsl/ir_builder.h
	xorg-server/Xext/xres.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/include/gc.h
	xorg-server/os/access.c

1 files changed, 22 insertions, 22 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index 20c36c559..a77e971d3 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -76,7 +76,7 @@ xkb_symbols "stea" {
 
     name[Group1]= "Lao (STEA proposed standard layout)";
 
-    key <TLDE> { [  quotedbl,      apostrophe           	]};
+    key <TLDE> { [  quotedbl,      apostrophe			]};
     key <AE01> { [ 0x1000ea2,               1,       0x1000ed1	]};
     key <AE02> { [ 0x1000e9f,               2,       0x1000ed2	]};
     key <AE03> { [ 0x1000ec2,               3,       0x1000ed3	]};
@@ -88,48 +88,48 @@ 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 <AD02> { [ 0x1000ec4,               0			]};
-    key <AD03> { [ 0x1000eb3,       asterisk			]};
-    key <AD04> { [ 0x1000e9e,       underscore             	]};
-    key <AD05> { [ 0x1000eb0,       plus                	]};
+    key <AD03> { [ 0x1000eb3,        asterisk			]};
+    key <AD04> { [ 0x1000e9e,      underscore			]};
+    key <AD05> { [ 0x1000eb0,            plus			]};
     key <AD06> { [ 0x1000eb4					]};
     key <AD07> { [ 0x1000eb5					]};
-    key <AD08> { [ 0x1000eae,       0x1000ea3	                ]};
+    key <AD08> { [ 0x1000eae,       0x1000ea3			]};
     key <AD09> { [ 0x1000e99,       0x1000edc			]};
     key <AD10> { [ 0x1000e8d,       0x1000ebd			]};
-    key <AD11> { [ 0x1000e9a,       minus			]};
-    key <AD12> { [ 0x1000ea5        				]};
-    key <BKSL> { [     slash,       backslash	                ]};
+    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	]};
-    key <AC05> { [ 0x1000ec0,       colon	]};
+    key <AC03> { [ 0x1000e81,          period	]};
+    key <AC04> { [ 0x1000e94,           comma	]};
+    key <AC05> { [ 0x1000ec0,           colon	]};
     key <AC06> { [ 0x1000ec9,       0x1000eca	]};
     key <AC07> { [ 0x1000ec8,       0x1000ecb	]};
-    key <AC08> { [ 0x1000eb2,       exclam	]};
-    key <AC09> { [ 0x1000eaa,       question	]};
-    key <AC10> { [ 0x1000ea7,       percent	]};
-    key <AC11> { [ 0x1000e87,       equal	]};
+    key <AC08> { [ 0x1000eb2,          exclam	]};
+    key <AC09> { [ 0x1000eaa,        question	]};
+    key <AC10> { [ 0x1000ea7,         percent	]};
+    key <AC11> { [ 0x1000e87,           equal	]};
 
     key <AB01> { [ 0x1000e9c,       0x10020ad	]};
     key <AB02> { [ 0x1000e9b,       parenleft	]};
     key <AB03> { [ 0x1000ec1,       0x1000eaf	]};
-    key <AB04> { [ 0x1000ead,       x		]};
+    key <AB04> { [ 0x1000ead,               x	]};
     key <AB05> { [ 0x1000eb6			]};
     key <AB06> { [ 0x1000eb7			]};
     key <AB07> { [ 0x1000e97,       0x1000ec6	]};
     key <AB08> { [ 0x1000ea1,       0x1000edd	]};
-    key <AB09> { [ 0x1000ec3,       dollar	]};
-    key <AB10> { [ 0x1000e9d,       parenright	]};
+    key <AB09> { [ 0x1000ec3,          dollar	]};
+    key <AB10> { [ 0x1000e9d,      parenright	]};
 
-    key <SPCE> { [ space, nobreakspace, nobreakspace		]};
+    key <SPCE> { [     space,    nobreakspace,    nobreakspace	]};
 
-    key <KPDL> { [     comma,       period 			]};
+    key <KPDL> { [     comma,          period 			]};
 
     include "level3(ralt_switch)"
 };