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/mao b/xorg-server/xkeyboard-config/symbols/mao
index b62994b2c..ce1b2ea3c 100644
--- a/xorg-server/xkeyboard-config/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
@@ -1,21 +1,21 @@
-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    // Adds the macrons needed for the Maori language to

-    // a simple us keyboard layout.

-

-    include "latin"

-

-    name[Group1]="Maori";

-

-    key <AC01>  { [ a,   A,  amacron, Amacron ] };

-    key <AD03>  { [ e,   E,  emacron, Emacron ] };

-    key <AD08>  { [ i,   I,  imacron, Imacron ] };

-

-    key <AD09>  { [ o,   O,  omacron, Omacron ] };

-    key <AD07>  { [ u,   U,  umacron, Umacron ] };

-

-    key <RALT>  { type[Group1]="TWO_LEVEL",

-                  [ ISO_Level3_Shift, Multi_key ]   };

-    modifier_map Mod5   { <RALT> };

-};

+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Adds the macrons needed for the Maori language to
+    // a simple us keyboard layout.
+
+    include "latin"
+
+    name[Group1]="Maori";
+
+    key <AC01>  { [ a,   A,  amacron, Amacron ] };
+    key <AD03>  { [ e,   E,  emacron, Emacron ] };
+    key <AD08>  { [ i,   I,  imacron, Imacron ] };
+
+    key <AD09>  { [ o,   O,  omacron, Omacron ] };
+    key <AD07>  { [ u,   U,  umacron, Umacron ] };
+
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+    modifier_map Mod5   { <RALT> };
+};