Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 51 insertions, 51 deletions

diff --git a/xorg-server/xkeyboard-config/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc
index b8fe667d2..a7a2cc425 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

-//

-

-default xkb_compatibility "olpc"  {

-    include "complete"

-

-    virtual_modifiers  Square,Cross,Triangle,Circle;

-

-    interpret KP_Home+Any     {

-        //useModMapMods= level1;

-       virtualModifier= Square;

-       action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret KP_Home  {

-       action = SetMods(modifiers=Square);

-    };

-

-    interpret KP_Next+Any     {

-        //useModMapMods= level1;

-       virtualModifier= Cross;

-       action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret KP_Next  {

-       action = SetMods(modifiers=Cross);

-    };

-

-    interpret KP_End+Any     {

-        //useModMapMods= level1;

-       virtualModifier= Circle;

-       action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret KP_End   {

-       action = SetMods(modifiers=Circle);

-    };

-

-    interpret KP_Prior+Any     {

-        //useModMapMods= level1;

-       virtualModifier= Triangle;

-       action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret KP_Prior {

-       action = SetMods(modifiers=Triangle);

-    };

-};

+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Map the OLPC game keys to virtual modifiers
+//
+
+default xkb_compatibility "olpc"  {
+    include "complete"
+
+    virtual_modifiers  Square,Cross,Triangle,Circle;
+
+    interpret KP_Home+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Square;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Home  {
+       action = SetMods(modifiers=Square);
+    };
+
+    interpret KP_Next+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Cross;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Next  {
+       action = SetMods(modifiers=Cross);
+    };
+
+    interpret KP_End+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Circle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_End   {
+       action = SetMods(modifiers=Circle);
+    };
+
+    interpret KP_Prior+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Triangle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Prior {
+       action = SetMods(modifiers=Triangle);
+    };
+};