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

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 889653f8e..2438231cd 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -1,62 +1,62 @@
-xkb_symbols "extended" {

-

-    name[Group1]= "Italy - Mac";

-

-    // Alphanumeric section

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

-    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};

-    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};

-    key <AE02> {	[    quotedbl,    2 		]	};

-    key <AE03> {	[  apostrophe,    3         	]	};

-    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};

-    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};

-    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};

-    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};

-    key <AE08> {	[    sterling,    8,   infinity			]	};

-    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};

-    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};

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

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

-

-    key <AD01> {	[           q,  Q 		]	};

-    key <AD02> {	[	    z,  Z		]	};

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

-    key <AD04> {	[	    r,  R,   registered			] 	};

-    key <AD05> {	[	    t,  T		]	};

-    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};

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

-    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};

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

-    key <AD10> {	[	    p,  P		]	};

-    key <AD11> {	[      igrave,  asciicircum     ]	};

-    key <AD12> {	[      dollar,	asterisk        ]	};

-    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};

-

-    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};

-    key <AC02> {	[	  s,	S,     ssharp			]	};

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};

-    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};

-    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};

-    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};

-    key <AC10> {	[         m,	M,         mu,    Oacute		]	};

-    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};

-

-    key <AB01> {	[	  w,	W 		]	};

-    key <AB02> {	[	  x,	X		]	};

-    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};

-    key <AB04> {	[	  v,	V		]	};

-    key <AB05> {	[	  b,	B		]	};

-    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };

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

-    key <AB08> {	[ semicolon,	period          ]	};

-    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};

-    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};

-

-    // End alphanumeric section

-

-    include "kpdl(dot)"

-    include "level3(ralt_switch)"

-};

+xkb_symbols "extended" {
+
+    name[Group1]= "Italy - Mac";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,  greater   	]	};
+    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
+    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
+    key <AE02> {	[    quotedbl,    2 		]	};
+    key <AE03> {	[  apostrophe,    3         	]	};
+    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
+    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
+    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
+    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
+    key <AE08> {	[    sterling,    8,   infinity			]	};
+    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
+    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
+    key <AE11> {	[       minus,    underscore	]	};
+    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
+
+    key <AD01> {	[           q,  Q 		]	};
+    key <AD02> {	[	    z,  Z		]	};
+    key <AD03> {	[	    e,  E,     EuroSign		]	};
+    key <AD04> {	[	    r,  R,   registered			] 	};
+    key <AD05> {	[	    t,  T		]	};
+    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,  U		]	};
+    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,  O		]	};
+    key <AD10> {	[	    p,  P		]	};
+    key <AD11> {	[      igrave,  asciicircum     ]	};
+    key <AD12> {	[      dollar,	asterisk        ]	};
+    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
+
+    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
+    key <AC02> {	[	  s,	S,     ssharp			]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
+    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question,          questiondown		]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
+    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
+
+    // End alphanumeric section
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};