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

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 09c2fb32f..54b61d215 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -1,101 +1,101 @@
-//

-// 03.01.2003

-// Andreas Tobler <a.tobler@schweiz.ch>

-// modified for Swiss German Apple Extended Keyboard II

-

-partial alphanumeric_keys

-xkb_symbols "extended" {

-    

-    name[Group1]= "Switzerland - German, Mac";

-

-    // Alphanumeric section

-

-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};

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

-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};

-					// not displayed here

-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};

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

-    key <AE06> { [	6,	ampersand, 	bracketright			]	};

-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};

-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};

-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};

-    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};

-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};

-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};

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

-    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};

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

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

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

-    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};

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

-    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};

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

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

-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};

-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};

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

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

-					// ligature fl

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

-			// partialderivative is not available here att

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

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

-    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};

-    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};

-    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};

-    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};

-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};

-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};

-    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};

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

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

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

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

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

-					// to be fixed att

-    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };

-					// not sure att

-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};

-    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};

-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};

-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};

-			// ligature fi	// per mille

-    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};

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

-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};

-

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "de" {

-    include "macintosh_vndr/ch(extended)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "fr" {

-

-    // Describes the differences between a very simple US/ASCII

-    // keyboard and a very simple Swiss/French keybaord

-

-    include "macintosh_vndr/ch(extended)"

-    name[Group1]= "Switzerland - French, Mac";

-

-    override key <AD11> {

-	[ egrave,	udiaeresis,  bracketleft	]

-    };

-    override key <AC10> {

-	[ eacute,	odiaeresis	]

-    };

-    override key <AC11> {

-	[ agrave,	adiaeresis,   braceleft		]

-    };

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/ch(fr)" // for consistent naming

-};

+//
+// 03.01.2003
+// Andreas Tobler <a.tobler@schweiz.ch>
+// modified for Swiss German Apple Extended Keyboard II
+
+partial alphanumeric_keys
+xkb_symbols "extended" {
+    
+    name[Group1]= "Switzerland - German, Mac";
+
+    // Alphanumeric section
+
+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
+					// not displayed here
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    key <AE05> { [	5,	percent, 	bracketleft			]	};
+    key <AE06> { [	6,	ampersand, 	bracketright			]	};
+    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
+    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
+    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
+    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
+    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
+    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
+    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
+    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
+					// ligature fl
+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
+			// partialderivative is not available here att
+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
+					// to be fixed att
+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
+					// not sure att
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+			// ligature fi	// per mille
+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "macintosh_vndr/ch(extended)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "macintosh_vndr/ch(extended)"
+    name[Group1]= "Switzerland - French, Mac";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis,  bracketleft	]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis,   braceleft		]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/ch(fr)" // for consistent naming
+};