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/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc
index a7a2cc425..747b444ec 100644
--- a/xorg-server/xkeyboard-config/compat/olpc
+++ b/xorg-server/xkeyboard-config/compat/olpc
@@ -1,51 +1,51 @@
 //
-// Created by Bernardo Innocenti <bernie@codewiz.org>
+// Map the OLPC game keys to virtual modifiers.
 //
-// Map the OLPC game keys to virtual modifiers
+// Created by Bernardo Innocenti <bernie@codewiz.org>
 //
 
-default xkb_compatibility "olpc"  {
+default xkb_compatibility "olpc" {
     include "complete"
 
     virtual_modifiers  Square,Cross,Triangle,Circle;
 
-    interpret KP_Home+Any     {
+    interpret KP_Home+Any {
         //useModMapMods= level1;
-       virtualModifier= Square;
-       action = SetMods(modifiers=modMapMods);
+        virtualModifier= Square;
+        action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_Home  {
-       action = SetMods(modifiers=Square);
+    interpret KP_Home {
+        action = SetMods(modifiers=Square);
     };
 
-    interpret KP_Next+Any     {
+    interpret KP_Next+Any {
         //useModMapMods= level1;
-       virtualModifier= Cross;
-       action = SetMods(modifiers=modMapMods);
+        virtualModifier= Cross;
+        action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_Next  {
-       action = SetMods(modifiers=Cross);
+    interpret KP_Next {
+        action = SetMods(modifiers=Cross);
     };
 
-    interpret KP_End+Any     {
+    interpret KP_End+Any {
         //useModMapMods= level1;
-       virtualModifier= Circle;
-       action = SetMods(modifiers=modMapMods);
+        virtualModifier= Circle;
+        action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_End   {
-       action = SetMods(modifiers=Circle);
+    interpret KP_End {
+        action = SetMods(modifiers=Circle);
     };
 
-    interpret KP_Prior+Any     {
+    interpret KP_Prior+Any {
         //useModMapMods= level1;
-       virtualModifier= Triangle;
-       action = SetMods(modifiers=modMapMods);
+        virtualModifier= Triangle;
+        action = SetMods(modifiers=modMapMods);
     };
 
     interpret KP_Prior {
-       action = SetMods(modifiers=Triangle);
+        action = SetMods(modifiers=Triangle);
     };
 };