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

diff --git a/X11/extensions/geproto.h b/X11/extensions/geproto.h
index c8860dd87..7302275e4 100644
--- a/X11/extensions/geproto.h
+++ b/X11/extensions/geproto.h
@@ -1,85 +1,85 @@
-/*
- * Copyright © 2007-2008 Peter Hutterer
- *
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors: Peter Hutterer, University of South Australia, NICTA
- *
- */
-
-#ifndef _GEPROTO_H_
-#define _GEPROTO_H_
-
-#include<X11/Xproto.h>
-#include<X11/X.h>
-#include<X11/extensions/ge.h>
-
-
-/*********************************************************
- *
- * Protocol request constants
- *
- */
-
-#define X_GEGetExtensionVersion 1
-
-/*********************************************************
- *
- * XGE protocol requests/replies
- *
- */
-
-/* generic request */
-typedef struct {
-    CARD8   reqType;
-    CARD8   ReqType;
-    CARD16  length B16;
-} xGEReq;
-
-
-/* QueryVersion */
-typedef struct {
-    CARD8	reqType;       /* input extension major code   */
-    CARD8	ReqType;       /* always X_GEQueryVersion */
-    CARD16	length B16;
-    CARD16      majorVersion B16;
-    CARD16      minorVersion B16;
-} xGEQueryVersionReq;
-
-#define sz_xGEQueryVersionReq    8
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_GEQueryVersion */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;
-    CARD16	minorVersion B16;
-    CARD32	pad00 B32;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-} xGEQueryVersionReply;
-
-#define sz_xGEQueryVersionReply    32
-
-#endif /* _GEPROTO_H_ */
-
+/*

+ * Copyright © 2007-2008 Peter Hutterer

+ *

+ * 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, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ * Authors: Peter Hutterer, University of South Australia, NICTA

+ *

+ */

+

+#ifndef _GEPROTO_H_

+#define _GEPROTO_H_

+

+#include<X11/Xproto.h>

+#include<X11/X.h>

+#include<X11/extensions/ge.h>

+

+

+/*********************************************************

+ *

+ * Protocol request constants

+ *

+ */

+

+#define X_GEGetExtensionVersion 1

+

+/*********************************************************

+ *

+ * XGE protocol requests/replies

+ *

+ */

+

+/* generic request */

+typedef struct {

+    CARD8   reqType;

+    CARD8   ReqType;

+    CARD16  length B16;

+} xGEReq;

+

+

+/* QueryVersion */

+typedef struct {

+    CARD8	reqType;       /* input extension major code   */

+    CARD8	ReqType;       /* always X_GEQueryVersion */

+    CARD16	length B16;

+    CARD16      majorVersion B16;

+    CARD16      minorVersion B16;

+} xGEQueryVersionReq;

+

+#define sz_xGEQueryVersionReq    8

+

+typedef struct {

+    CARD8	repType;	/* X_Reply			*/

+    CARD8	RepType;	/* always X_GEQueryVersion */

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD16	majorVersion B16;

+    CARD16	minorVersion B16;

+    CARD32	pad00 B32;

+    CARD32	pad01 B32;

+    CARD32	pad02 B32;

+    CARD32	pad03 B32;

+    CARD32	pad04 B32;

+} xGEQueryVersionReply;

+

+#define sz_xGEQueryVersionReply    32

+

+#endif /* _GEPROTO_H_ */

+