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, 18 insertions, 17 deletions

diff --git a/xorg-server/xkeyboard-config/compat/ledcaps b/xorg-server/xkeyboard-config/compat/ledcaps
index fc3084eec..f1460ba36 100644
--- a/xorg-server/xkeyboard-config/compat/ledcaps
+++ b/xorg-server/xkeyboard-config/compat/ledcaps
@@ -1,23 +1,24 @@
-// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
+// Use the Caps Lock LED to show either
+// Caps Lock, Group, or Shift Lock state.
 
-default partial xkb_compatibility "caps_lock"   {
-   indicator "Caps Lock" {
-       !allowExplicit;
-       whichModState= Locked;
-       modifiers= Lock;
-   };
+default partial xkb_compatibility "caps_lock" {
+    indicator "Caps Lock" {
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= Lock;
+    };
 };
 
-partial xkb_compatibility "group_lock"   {
-   indicator "Caps Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
+partial xkb_compatibility "group_lock" {
+    indicator "Caps Lock" {
+	modifiers= None;
+	groups=All-group1;
+    };
 };
 
-partial xkb_compatibility "shift_lock"   {
-   indicator "Caps Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
+partial xkb_compatibility "shift_lock" {
+    indicator "Caps Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
 };