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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index 58abfd6e6..202e8a4c1 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
@@ -1,98 +1,98 @@
-//

-// 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]="Belgium";

-

-    key <TLDE>  { [twosuperior, threesuperior                         ] };

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

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

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

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

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

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

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

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

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

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

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

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

-

-    key <AD01>  { [         a,          A                             ] };

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

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

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

-    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };

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

-

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

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

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

-    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };

-

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

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

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

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

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

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

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/be(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]="Belgium";
+
+    key <TLDE>  { [twosuperior, threesuperior                         ] };
+    key <AE01>  { [ ampersand,          1,          bar               ] };
+    key <AE02>  { [    eacute,          2,           at               ] };
+    key <AE03>  { [  quotedbl,          3,   numbersign               ] };
+    key <AE04>  { [apostrophe,          4                             ] };
+    key <AE05>  { [ parenleft,          5                             ] };
+    key <AE06>  { [   section,          6,  asciicircum               ] };
+    key <AE07>  { [    egrave,          7                             ] };
+    key <AE08>  { [    exclam,          8                             ] };
+    key <AE09>  { [  ccedilla,          9,    braceleft               ] };
+    key <AE10>  { [    agrave,          0,   braceright               ] };
+    key <AE11>  { [parenright,     degree                             ] };
+    key <AE12>  { [     minus, underscore                             ] };
+
+    key <AD01>  { [         a,          A                             ] };
+    key <AD02>  { [         z,          Z                             ] };
+    key <AD03>  { [         e,          E,     EuroSign               ] };
+    key <AD09>  { [         o,          O                             ] };
+    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };
+    key <AD12>  { [    dollar,   asterisk, bracketright               ] };
+
+    key <AC01>  { [         q,          Q                             ] };
+    key <AC10>  { [         m,          M                             ] };
+    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };
+    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };
+
+    key <LSGT>  { [      less,    greater,    backslash               ] };
+    key <AB01>  { [         w,          W                             ] };
+    key <AB07>  { [     comma,   question                             ] };
+    key <AB08>  { [ semicolon,     period                             ] };
+    key <AB09>  { [     colon,      slash                             ] };
+    key <AB10>  { [     equal,       plus,   dead_tilde               ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/be(type6)"
+};