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, 21 insertions, 21 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc
index 9e74e47b8..e9e950b1e 100644
--- a/xorg-server/xkeyboard-config/symbols/olpc
+++ b/xorg-server/xkeyboard-config/symbols/olpc
@@ -1,21 +1,21 @@
-//

-// Created by Bernardo Innocenti <bernie@codewiz.org>

-//

-// Additional symbol definitions for the OLPC keyboards

-//

-

-alphanumeric_keys modifier_keys

-xkb_symbols "olpc" {

-    include "pc(pc105)"

-

-    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key

-    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key

-    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key

-    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key

-

-    key <I220> { [ XF86Search    ] }; // search key

-    key <I221> { [ XF86Meeting   ] }; // fn+search key

-    key <I236> { [ XF86Start     ] }; // gear key (fn+space)

-    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)

-    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)

-};

+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Additional symbol definitions for the OLPC keyboards
+//
+
+alphanumeric_keys modifier_keys
+xkb_symbols "olpc" {
+    include "pc(pc105)"
+
+    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key
+    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key
+    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key
+    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key
+
+    key <I220> { [ XF86Search    ] }; // search key
+    key <I221> { [ XF86Meeting   ] }; // fn+search key
+    key <I236> { [ XF86Start     ] }; // gear key (fn+space)
+    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)
+    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
+};