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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 914a80dde..0530f9e2f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Estonia";

-

-

-   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };

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

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

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

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

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

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

-   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };

-   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };

-   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };

-   key <AE10> { [              0,         equal,	braceright,        degree ] };

-   key <AE11> { [           plus,      question,	backslash,  questiondown ] };

-   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };

-

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

-   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };

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

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

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

-   key <AD06> { [              y,             Y,	leftarrow,           yen ] };

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

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

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

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

-   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };

-   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };

-

-   key <AC01> { [              a,             A,	ae,            AE ] };

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

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

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

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

-   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };

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

-   key <AC08> { [              k,             K,	kra,     ampersand ] };

-   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };

-   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };

-   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };

-   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };

-

-   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };

-   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };

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

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

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

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

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

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

-   key <AB08> { [          comma,     semicolon,	less,      multiply ] };

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

-   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ee(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Estonia";
+
+
+   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };
+   key <AE04> { [              4,      currency,	dollar,        dollar ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };
+   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };
+   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };
+   key <AE10> { [              0,         equal,	braceright,        degree ] };
+   key <AE11> { [           plus,      question,	backslash,  questiondown ] };
+   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };
+
+   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };
+   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };
+   key <AD03> { [              e,             E,	EuroSign,          cent ] };
+   key <AD04> { [              r,             R,	paragraph,    registered ] };
+   key <AD05> { [              t,             T,	tslash,        Tslash ] };
+   key <AD06> { [              y,             Y,	leftarrow,           yen ] };
+   key <AD07> { [              u,             U,	downarrow,       uparrow ] };
+   key <AD08> { [              i,             I,	rightarrow,      idotless ] };
+   key <AD09> { [              o,             O,	oslash,      Ooblique ] };
+   key <AD10> { [              p,             P,	thorn,         THORN ] };
+   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };
+   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };
+
+   key <AC01> { [              a,             A,	ae,            AE ] };
+   key <AC02> { [              s,             S,	ssharp,       section ] };
+   key <AC03> { [              d,             D,	eth,           ETH ] };
+   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };
+   key <AC05> { [              g,             G,	eng,           ENG ] };
+   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kra,     ampersand ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };
+   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	guillemotright,       greater ] };
+   key <AB03> { [              c,             C,	cent,     copyright ] };
+   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };
+   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	mu,     masculine ] };
+   key <AB08> { [          comma,     semicolon,	less,      multiply ] };
+   key <AB09> { [         period,         colon,	greater,      division ] };
+   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ee(type6)"
+};