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

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
index a588ab27c..dcb9db624 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
@@ -1,37 +1,37 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple Spanish keybaord

-

-    include "latin"

-    name[Group1]= "Latin American - Mac";

-

-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};

-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};

-    key <AE01> {	[               1,      exclamdown 	]	};

-    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};

-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};

-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};

-    key <AE05> {	[               5,         percent	]	};

-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};

-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};

-    key <AE08> {	[               8,        asterisk,           degree	]	};

-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};

-    key <AE10> {	[               0,      parenright     	]	};

-    key <AE11> {	[           minus,      underscore	]	};

-    key <AE12> {	[           equal,            plus,        plusminus	]	};

-    key <AD11> {	[      dead_grave,          degree 	]	};

-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};

-

-    key <AB08> {	[           comma,    questiondown   	]	};

-    key <AB09> {	[          period,        question     	]	};

-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};

-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};

-    key <AC11> {	[       semicolon,    	     colon 	]	};

-    key <BKSL> {	[      apostrophe,        quotedbl	]	};

-

-    // End alphanumeric section

-

-    include "level3(ralt_switch)"

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "latin"
+    name[Group1]= "Latin American - Mac";
+
+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+    key <AE01> {	[               1,      exclamdown 	]	};
+    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+    key <AE05> {	[               5,         percent	]	};
+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+    key <AE08> {	[               8,        asterisk,           degree	]	};
+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+    key <AE10> {	[               0,      parenright     	]	};
+    key <AE11> {	[           minus,      underscore	]	};
+    key <AE12> {	[           equal,            plus,        plusminus	]	};
+    key <AD11> {	[      dead_grave,          degree 	]	};
+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+
+    key <AB08> {	[           comma,    questiondown   	]	};
+    key <AB09> {	[          period,        question     	]	};
+    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+    key <AC11> {	[       semicolon,    	     colon 	]	};
+    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};