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

diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
index 7e07198d6..aedda92d2 100644
--- a/xorg-server/xkeyboard-config/symbols/hp_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
@@ -1,104 +1,104 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

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

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

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

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

-//from The Open Group.

-//

-// US/ASCII layout for a HP non-PC keyboard

-xkb_symbols "hil" {

-    include "us(basic)"

-

-    // A few alphanumeric keys are different

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

-    key <RTSH> { [ Shift_R	]};

-    key <LALT> { [ Meta_L	]};

-    key <RALT> { [ Meta_R	]};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <BRK>  { [ Break	]};

-    key <STOP> { [ Cancel	]};

-    key <FK01> { [ F1	]	};

-    key <FK02> { [ F2	]	};

-    key <FK03> { [ F3	]	};

-    key <FK04> { [ F4	]	};

-    key <MENU> { [ Menu	]	};

-    key <SYST> { [ hpSystem	]};

-    key <FK05> { [ F5	]	};

-    key <FK06> { [ F6	]	};

-    key <FK07> { [ F7	]	};

-    key <FK08> { [ F8	]	};

-    key <CLRL> { [ hpClearLine	]};

-    key <CLR>  { [ Clear	]};

-    key <FK09> { [ F9	]	};

-    key <FK10> { [ F10	]	};

-    key <FK11> { [ F11	]	};

-    key <FK12> { [ F12	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ Execute, Print	]};

-    key <INSL> { [ hpInsertLine	]};

-    key <DELL> { [ hpDeleteLine	]};

-    key <INSC> { [ hpInsertChar	]};

-    key <DELC> { [ hpDeleteChar	]};

-    key <HOME> { [ Home	]	};

-    key <PGUP> { [ Prior ]	};

-    key <PGDN> { [ Next ]	};

-    key <SELE> { [ Select ]	};

-    key <LEFT> { [ Left	]	};

-    key <DOWN> { [ Down	]	};

-    key <UP>   { [ Up	]	};

-    key <RGHT> { [ Right	]};

-

-    // End "Editing" section, begin "Keypad"

-    key <KPMU> { [ KP_Multiply	]};

-    key <KPDV> { [ KP_Divide	]};

-    key <KPAD> { [ KP_Add	]};

-    key <KPSU> { [ KP_Subtract	]};

-

-    key  <KP7> { [ KP_7	]	};

-    key  <KP8> { [ KP_8	]	};

-    key  <KP9> { [ KP_9	]	};

-    key <KPEN> { [ KP_Enter	]}; 

-

-    key  <KP4> { [ KP_4	]	};

-    key  <KP5> { [ KP_5	]	};

-    key  <KP6> { [ KP_6	]	};

-    key <KPSP> { [ KP_Separator	]};

-

-    key  <KP1> { [ KP_1	]	};

-    key  <KP2> { [ KP_2	]	};

-    key  <KP3> { [ KP_3	]	};

-    key <KPTB> { [ KP_Tab	]}; 

-

-    key  <KP0> { [ KP_0	]	};

-    key <KPDL> { [ KP_Decimal ]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2   	{ Alt_L };

-    modifier_map Mod3   	{ Mode_switch };

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//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.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a HP non-PC keyboard
+xkb_symbols "hil" {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave,	asciitilde	]};
+    key <RTSH> { [ Shift_R	]};
+    key <LALT> { [ Meta_L	]};
+    key <RALT> { [ Meta_R	]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break	]};
+    key <STOP> { [ Cancel	]};
+    key <FK01> { [ F1	]	};
+    key <FK02> { [ F2	]	};
+    key <FK03> { [ F3	]	};
+    key <FK04> { [ F4	]	};
+    key <MENU> { [ Menu	]	};
+    key <SYST> { [ hpSystem	]};
+    key <FK05> { [ F5	]	};
+    key <FK06> { [ F6	]	};
+    key <FK07> { [ F7	]	};
+    key <FK08> { [ F8	]	};
+    key <CLRL> { [ hpClearLine	]};
+    key <CLR>  { [ Clear	]};
+    key <FK09> { [ F9	]	};
+    key <FK10> { [ F10	]	};
+    key <FK11> { [ F11	]	};
+    key <FK12> { [ F12	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Execute, Print	]};
+    key <INSL> { [ hpInsertLine	]};
+    key <DELL> { [ hpDeleteLine	]};
+    key <INSC> { [ hpInsertChar	]};
+    key <DELC> { [ hpDeleteChar	]};
+    key <HOME> { [ Home	]	};
+    key <PGUP> { [ Prior ]	};
+    key <PGDN> { [ Next ]	};
+    key <SELE> { [ Select ]	};
+    key <LEFT> { [ Left	]	};
+    key <DOWN> { [ Down	]	};
+    key <UP>   { [ Up	]	};
+    key <RGHT> { [ Right	]};
+
+    // End "Editing" section, begin "Keypad"
+    key <KPMU> { [ KP_Multiply	]};
+    key <KPDV> { [ KP_Divide	]};
+    key <KPAD> { [ KP_Add	]};
+    key <KPSU> { [ KP_Subtract	]};
+
+    key  <KP7> { [ KP_7	]	};
+    key  <KP8> { [ KP_8	]	};
+    key  <KP9> { [ KP_9	]	};
+    key <KPEN> { [ KP_Enter	]}; 
+
+    key  <KP4> { [ KP_4	]	};
+    key  <KP5> { [ KP_5	]	};
+    key  <KP6> { [ KP_6	]	};
+    key <KPSP> { [ KP_Separator	]};
+
+    key  <KP1> { [ KP_1	]	};
+    key  <KP2> { [ KP_2	]	};
+    key  <KP3> { [ KP_3	]	};
+    key <KPTB> { [ KP_Tab	]}; 
+
+    key  <KP0> { [ KP_0	]	};
+    key <KPDL> { [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Alt_L };
+    modifier_map Mod3   	{ Mode_switch };
+};