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/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index c3a83dad0..1f3fac799 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
@@ -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]="Greece";

-

-

-	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };

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

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

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

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

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

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

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

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

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

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

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

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

-

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

-	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };

-	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };

-	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };

-	key <AD05> { [             Greek_tau,      Greek_TAU ] };

-	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };

-	key <AD07> { [           Greek_theta,    Greek_THETA ] };

-	key <AD08> { [            Greek_iota,     Greek_IOTA ] };

-	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };

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

-	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };

-	key <AD12> { [          bracketright,     braceright,	guillemotright ] };

-

-	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };

-	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };

-	key <AC03> { [           Greek_delta,    Greek_DELTA ] };

-	key <AC04> { [             Greek_phi,      Greek_PHI ] };

-	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };

-	key <AC06> { [             Greek_eta,      Greek_ETA ] };

-	key <AC07> { [              Greek_xi,       Greek_XI ] };

-	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };

-	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };

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

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

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

-

-	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };

-        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };

-        key <AB02> { [             Greek_chi,      Greek_CHI ] };

-        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };

-        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };

-        key <AB05> { [            Greek_beta,     Greek_BETA ] };

-        key <AB06> { [              Greek_nu,       Greek_NU ] };

-        key <AB07> { [              Greek_mu,       Greek_MU ] };

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

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

-	key <AB10> { [                 slash,       question ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/gr(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]="Greece";
+
+
+	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
+	key <AE01> { [                     1,         exclam ] };
+	key <AE02> { [                     2,             at ] };
+	key <AE03> { [                     3,     numbersign,	sterling ] };
+	key <AE04> { [                     4,         dollar,	EuroSign ] };
+	key <AE05> { [                     5,        percent,	EuroSign ] };
+	key <AE06> { [                     6,    asciicircum,	notsign ] };
+	key <AE07> { [                     7,      ampersand ] };
+	key <AE08> { [                     8,       asterisk ] };
+	key <AE09> { [                     9,      parenleft ] };
+	key <AE10> { [                     0,     parenright,	degree ] };
+	key <AE11> { [                 minus,     underscore,	plusminus ] };
+	key <AE12> { [                 equal,           plus ] };
+
+	key <AD01> { [             semicolon,          colon,	periodcentered ] };
+	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };
+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };
+	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };
+	key <AD05> { [             Greek_tau,      Greek_TAU ] };
+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
+	key <AD07> { [           Greek_theta,    Greek_THETA ] };
+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
+	key <AD10> { [              Greek_pi,       Greek_PI ] };
+	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };
+	key <AD12> { [          bracketright,     braceright,	guillemotright ] };
+
+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
+	key <AC04> { [             Greek_phi,      Greek_PHI ] };
+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
+	key <AC06> { [             Greek_eta,      Greek_ETA ] };
+	key <AC07> { [              Greek_xi,       Greek_XI ] };
+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
+	key <AC10> { [            dead_acute, dead_diaeresis ] };
+	key <AC11> { [            apostrophe,       quotedbl ] };
+	key <BKSL> { [             backslash,            bar,	brokenbar ] };
+
+	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+        key <AB02> { [             Greek_chi,      Greek_CHI ] };
+        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+        key <AB05> { [            Greek_beta,     Greek_BETA ] };
+        key <AB06> { [              Greek_nu,       Greek_NU ] };
+        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB08> { [                 comma,           less,	guillemotleft ] };
+	key <AB09> { [                period,        greater,	guillemotright ] };
+	key <AB10> { [                 slash,       question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gr(type6)"
+};