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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index bbb414da7..bcc8c30cc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
@@ -1,144 +1,144 @@
-//

-// 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 alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Norway";

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    key <AD11> { [           aring,           Aring                ] };

-    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };

-    key <AC10> { [          oslash,          Oslash                ] }; 

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

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

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

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

-

-        include "level3(ralt_switch)"

-        include "kpdl(comma)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-     name[Group1]="Norway - Sun type 4";

-

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

-    key <BRCR> { [ asciitilde, asciicircum]                     };

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

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

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

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

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

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

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

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

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

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

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

-    key <AD11> { [ aring, Aring                ]                       };

-    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };

-    key <LCTL> { [ Caps_Lock            ]                       };

-    key <AC10> { [ Ooblique             ]                       };

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

-    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };

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

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

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

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

-    key <CAPS> { [ Control_L            ]                       };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-    

-    name[Group1]="Norway - Sun type 5";

-

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

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

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

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

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

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

-

-    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };

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

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/no(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 alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Norway";
+
+    key <TLDE> { [             bar,         section                ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
+    key <AE02> { [               2,        quotedbl,  at           ] };
+    key <AE03> { [               3,      numbersign,  sterling     ] };
+    key <AE04> { [               4,        currency,  dollar       ] };
+    key <AE05> { [               5,         percent,  asciitilde   ] };
+    key <AE06> { [               6,       ampersand,  asciicircum  ] };
+    key <AE07> { [               7,           slash,  braceleft    ] };
+    key <AE08> { [               8,       parenleft,  bracketleft  ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,  braceright   ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
+    key <AD03> { [               e,               E,  EuroSign     ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
+    key <AC10> { [          oslash,          Oslash                ] }; 
+    key <AC11> { [              ae,              AE                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+     name[Group1]="Norway - Sun type 4";
+
+    key <BKSL> { [ bar, section         ]                       };
+    key <BRCR> { [ asciitilde, asciicircum]                     };
+    key <AE02> { [ 2, quotedbl, at          ]       };
+    key <AE03> { [ 3, numbersign, sterling    ]       };
+    key <AE04> { [ 4, currency, dollar      ]       };
+    key <AE06> { [ 6, ampersand         ]                       };
+    key <AE07> { [ 7, slash, braceleft   ]       };
+    key <AE08> { [ 8, parenleft, bracketleft ]       };
+    key <AE09> { [ 9, parenright, bracketright]       };
+    key <AE10> { [ 0, equal, braceright  ]       };
+    key <AE11> { [ plus, question       ]                       };
+    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };
+    key <AD03> { [ e, E, EuroSign    ]       };
+    key <AD11> { [ aring, Aring                ]                       };
+    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };
+    key <LCTL> { [ Caps_Lock            ]                       };
+    key <AC10> { [ Ooblique             ]                       };
+    key <AC11> { [ ae, AE                   ]                       };
+    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <CAPS> { [ Control_L            ]                       };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    
+    name[Group1]="Norway - Sun type 5";
+
+    key <AE05> { [ 5, percent, asciitilde               ] };
+    key <AE06> { [ 6, ampersand, asciicircum            ] };
+    key <AE07> { [ 7, slash,  braceleft                 ] };
+    key <AE08> { [ 8, parenleft,  bracketright          ] };
+    key <AE09> { [ 9, parenright,  bracketright         ] };
+    key <AE10> { [ 0, equal,  braceright                ] };
+
+    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
+    key <LSGT> { [ less, greater                        ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/no(type6)"
+};