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

diff --git a/mesalib/src/mapi/glapi/gen/glX_API.xml b/mesalib/src/mapi/glapi/gen/glX_API.xml
index ac2f4ace1..9e02aa498 100644
--- a/mesalib/src/mapi/glapi/gen/glX_API.xml
+++ b/mesalib/src/mapi/glapi/gen/glX_API.xml
@@ -1,220 +1,220 @@
-<?xml version="1.0"?>

-<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">

-

-<OpenGLAPI>

-

-<!-- Right now this file is just used to generate the GLX protocol

-     decode tables on the server.  The only information that is needed

-     for that purpose is the name of the function (or pseudo-function

-     in the case of Render of VendorPrivate) and its opcode.  Once

-     this file is used for other purposes, additional information will

-     need to be added.

-  -->

-

-<category name="1.0" window_system="glX">

-    <function name="Render">

-        <glx sop="1"/>

-    </function>

-

-    <function name="RenderLarge">

-        <glx sop="2"/>

-    </function>

-

-    <function name="CreateContext">

-        <glx sop="3"/>

-    </function>

-

-    <function name="DestroyContext">

-        <glx sop="4"/>

-    </function>

-

-    <function name="MakeCurrent">

-        <glx sop="5"/>

-    </function>

-

-    <function name="IsDirect">

-        <glx sop="6"/>

-    </function>

-

-    <function name="QueryVersion">

-        <glx sop="7"/>

-    </function>

-

-    <function name="WaitGL">

-        <glx sop="8"/>

-    </function>

-

-    <function name="WaitX">

-        <glx sop="9"/>

-    </function>

-

-    <function name="CopyContext">

-        <glx sop="10"/>

-    </function>

-

-    <function name="SwapBuffers">

-        <glx sop="11"/>

-    </function>

-

-    <function name="UseXFont">

-        <glx sop="12"/>

-    </function>

-

-    <function name="CreateGLXPixmap">

-        <glx sop="13"/>

-    </function>

-

-    <function name="GetVisualConfigs">

-        <glx sop="14"/>

-    </function>

-

-    <function name="DestroyGLXPixmap">

-        <glx sop="15"/>

-    </function>

-

-    <function name="VendorPrivate">

-        <glx sop="16"/>

-    </function>

-

-    <function name="VendorPrivateWithReply">

-        <glx sop="17"/>

-    </function>

-

-    <function name="QueryExtensionsString">

-        <glx sop="18"/>

-    </function>

-</category>

-

-<category name="1.1" window_system="glX">

-    <function name="QueryServerString">

-        <glx sop="19"/>

-    </function>

-

-    <function name="ClientInfo">

-        <glx sop="20"/>

-    </function>

-</category>

-

-<category name="1.3" window_system="glX">

-    <function name="GetFBConfigs">

-        <glx sop="21"/>

-    </function>

-

-    <function name="CreatePixmap">

-        <glx sop="22"/>

-    </function>

-

-    <function name="DestroyPixmap">

-        <glx sop="23"/>

-    </function>

-

-    <function name="CreateNewContext">

-        <glx sop="24"/>

-    </function>

-

-    <function name="QueryContext">

-        <glx sop="25"/>

-    </function>

-

-    <function name="MakeContextCurrent">

-        <glx sop="26"/>

-    </function>

-

-    <function name="CreatePbuffer">

-        <glx sop="27"/>

-    </function>

-

-    <function name="DestroyPbuffer">

-        <glx sop="28"/>

-    </function>

-

-    <function name="GetDrawableAttributes">

-        <glx sop="29"/>

-    </function>

-

-    <function name="ChangeDrawableAttributes">

-        <glx sop="30"/>

-    </function>

-

-    <function name="CreateWindow">

-        <glx sop="31"/>

-    </function>

-

-    <function name="DestroyWindow">

-        <glx sop="32"/>

-    </function>

-</category>

-

-<category name="GLX_SGI_swap_control" number="40" window_system="glX">

-    <function name="SwapIntervalSGI">

-        <return type="int"/>

-        <glx vendorpriv="65536"/>

-    </function>

-</category>

-

-<category name="GLX_SGI_make_current_read" number="42" window_system="glX">

-    <function name="MakeCurrentReadSGI">

-<!--        <param name="dpy" type="Display *"/>

-	<param name="draw" type="GLXDrawable"/>

-	<param name="read" type="GLXDrawable"/>

-	<param name="ctx" type="GLXContext"/> -->

-        <return type="Bool"/>

-        <glx vendorpriv="65537"/>

-    </function>

-</category>

-

-<category name="GLX_EXT_import_context" number="47" window_system="glX">

-    <function name="QueryContextInfoEXT">

-        <glx vendorpriv="1024"/>

-    </function>

-</category>

-

-<category name="GLX_SGIX_fbconfig" number="49" window_system="glX">

-    <function name="GetFBConfigsSGIX">

-        <glx vendorpriv="65540"/>

-    </function>

-

-    <function name="CreateContextWithConfigSGIX">

-        <glx vendorpriv="65541"/>

-    </function>

-

-    <function name="CreateGLXPixmapWithConfigSGIX">

-        <glx vendorpriv="65542"/>

-    </function>

-</category>

-

-<category name="GLX_SGIX_pbuffer" number="50" window_system="glX">

-    <function name="CreateGLXPbufferSGIX">

-        <glx vendorpriv="65543"/>

-    </function>

-

-    <function name="DestroyGLXPbufferSGIX">

-        <glx vendorpriv="65544"/>

-    </function>

-

-    <function name="ChangeDrawableAttributesSGIX">

-        <glx vendorpriv="65545"/>

-    </function>

-

-    <function name="GetDrawableAttributesSGIX">

-        <glx vendorpriv="65546"/>

-    </function>

-</category>

-

-<category name="GLX_MESA_copy_sub_buffer" number="215">

-    <function name="CopySubBufferMESA">

-        <glx vendorpriv="5154"/>

-    </function>

-</category>

-

-<category name="GLX_EXT_texture_from_pixmap">

-    <function name="BindTexImageEXT">

-        <glx vendorpriv="1330"/>

-    </function>

-

-    <function name="ReleaseTexImageEXT">

-        <glx vendorpriv="1331"/>

-    </function>

-</category>

-

-</OpenGLAPI>

+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<!-- Right now this file is just used to generate the GLX protocol
+     decode tables on the server.  The only information that is needed
+     for that purpose is the name of the function (or pseudo-function
+     in the case of Render of VendorPrivate) and its opcode.  Once
+     this file is used for other purposes, additional information will
+     need to be added.
+  -->
+
+<category name="1.0" window_system="glX">
+    <function name="Render">
+        <glx sop="1"/>
+    </function>
+
+    <function name="RenderLarge">
+        <glx sop="2"/>
+    </function>
+
+    <function name="CreateContext">
+        <glx sop="3"/>
+    </function>
+
+    <function name="DestroyContext">
+        <glx sop="4"/>
+    </function>
+
+    <function name="MakeCurrent">
+        <glx sop="5"/>
+    </function>
+
+    <function name="IsDirect">
+        <glx sop="6"/>
+    </function>
+
+    <function name="QueryVersion">
+        <glx sop="7"/>
+    </function>
+
+    <function name="WaitGL">
+        <glx sop="8"/>
+    </function>
+
+    <function name="WaitX">
+        <glx sop="9"/>
+    </function>
+
+    <function name="CopyContext">
+        <glx sop="10"/>
+    </function>
+
+    <function name="SwapBuffers">
+        <glx sop="11"/>
+    </function>
+
+    <function name="UseXFont">
+        <glx sop="12"/>
+    </function>
+
+    <function name="CreateGLXPixmap">
+        <glx sop="13"/>
+    </function>
+
+    <function name="GetVisualConfigs">
+        <glx sop="14"/>
+    </function>
+
+    <function name="DestroyGLXPixmap">
+        <glx sop="15"/>
+    </function>
+
+    <function name="VendorPrivate">
+        <glx sop="16"/>
+    </function>
+
+    <function name="VendorPrivateWithReply">
+        <glx sop="17"/>
+    </function>
+
+    <function name="QueryExtensionsString">
+        <glx sop="18"/>
+    </function>
+</category>
+
+<category name="1.1" window_system="glX">
+    <function name="QueryServerString">
+        <glx sop="19"/>
+    </function>
+
+    <function name="ClientInfo">
+        <glx sop="20"/>
+    </function>
+</category>
+
+<category name="1.3" window_system="glX">
+    <function name="GetFBConfigs">
+        <glx sop="21"/>
+    </function>
+
+    <function name="CreatePixmap">
+        <glx sop="22"/>
+    </function>
+
+    <function name="DestroyPixmap">
+        <glx sop="23"/>
+    </function>
+
+    <function name="CreateNewContext">
+        <glx sop="24"/>
+    </function>
+
+    <function name="QueryContext">
+        <glx sop="25"/>
+    </function>
+
+    <function name="MakeContextCurrent">
+        <glx sop="26"/>
+    </function>
+
+    <function name="CreatePbuffer">
+        <glx sop="27"/>
+    </function>
+
+    <function name="DestroyPbuffer">
+        <glx sop="28"/>
+    </function>
+
+    <function name="GetDrawableAttributes">
+        <glx sop="29"/>
+    </function>
+
+    <function name="ChangeDrawableAttributes">
+        <glx sop="30"/>
+    </function>
+
+    <function name="CreateWindow">
+        <glx sop="31"/>
+    </function>
+
+    <function name="DestroyWindow">
+        <glx sop="32"/>
+    </function>
+</category>
+
+<category name="GLX_SGI_swap_control" number="40" window_system="glX">
+    <function name="SwapIntervalSGI">
+        <return type="int"/>
+        <glx vendorpriv="65536"/>
+    </function>
+</category>
+
+<category name="GLX_SGI_make_current_read" number="42" window_system="glX">
+    <function name="MakeCurrentReadSGI">
+<!--        <param name="dpy" type="Display *"/>
+	<param name="draw" type="GLXDrawable"/>
+	<param name="read" type="GLXDrawable"/>
+	<param name="ctx" type="GLXContext"/> -->
+        <return type="Bool"/>
+        <glx vendorpriv="65537"/>
+    </function>
+</category>
+
+<category name="GLX_EXT_import_context" number="47" window_system="glX">
+    <function name="QueryContextInfoEXT">
+        <glx vendorpriv="1024"/>
+    </function>
+</category>
+
+<category name="GLX_SGIX_fbconfig" number="49" window_system="glX">
+    <function name="GetFBConfigsSGIX">
+        <glx vendorpriv="65540"/>
+    </function>
+
+    <function name="CreateContextWithConfigSGIX">
+        <glx vendorpriv="65541"/>
+    </function>
+
+    <function name="CreateGLXPixmapWithConfigSGIX">
+        <glx vendorpriv="65542"/>
+    </function>
+</category>
+
+<category name="GLX_SGIX_pbuffer" number="50" window_system="glX">
+    <function name="CreateGLXPbufferSGIX">
+        <glx vendorpriv="65543"/>
+    </function>
+
+    <function name="DestroyGLXPbufferSGIX">
+        <glx vendorpriv="65544"/>
+    </function>
+
+    <function name="ChangeDrawableAttributesSGIX">
+        <glx vendorpriv="65545"/>
+    </function>
+
+    <function name="GetDrawableAttributesSGIX">
+        <glx vendorpriv="65546"/>
+    </function>
+</category>
+
+<category name="GLX_MESA_copy_sub_buffer" number="215">
+    <function name="CopySubBufferMESA">
+        <glx vendorpriv="5154"/>
+    </function>
+</category>
+
+<category name="GLX_EXT_texture_from_pixmap">
+    <function name="BindTexImageEXT">
+        <glx vendorpriv="1330"/>
+    </function>
+
+    <function name="ReleaseTexImageEXT">
+        <glx vendorpriv="1331"/>
+    </function>
+</category>
+
+</OpenGLAPI>