Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 175 insertions, 175 deletions

diff --git a/X11/extensions/dpmsproto.h b/X11/extensions/dpmsproto.h
index e77ae976c..63fd3fc0e 100644
--- a/X11/extensions/dpmsproto.h
+++ b/X11/extensions/dpmsproto.h
@@ -1,175 +1,175 @@
-/*****************************************************************

-

-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.

-

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

-

-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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation

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

-dealings in this Software without prior written authorization from Digital

-Equipment Corporation.

-

-******************************************************************/

-

-#ifndef _DPMSPROTO_H_

-#define _DPMSPROTO_H_

-

-#include <X11/extensions/dpmsconst.h>

-

-#define X_DPMSGetVersion	0

-#define X_DPMSCapable		1

-#define X_DPMSGetTimeouts	2

-#define X_DPMSSetTimeouts	3

-#define X_DPMSEnable		4

-#define X_DPMSDisable		5

-#define X_DPMSForceLevel       	6

-#define X_DPMSInfo       	7

-

-#define DPMSNumberEvents	0

-

-#define DPMSNumberErrors	0

-

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSGetVersion */

-    CARD16	length B16;

-    CARD16	majorVersion B16;

-    CARD16	minorVersion B16;

-} xDPMSGetVersionReq;

-#define sz_xDPMSGetVersionReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;

-    CARD16	minorVersion B16;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xDPMSGetVersionReply;

-#define sz_xDPMSGetVersionReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSCapable */

-    CARD16	length B16;

-} xDPMSCapableReq;

-#define sz_xDPMSCapableReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    BOOL	capable;

-    CARD8	pad1;

-    CARD16	pad2 B16;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-    CARD32	pad7 B32;

-} xDPMSCapableReply;

-#define sz_xDPMSCapableReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSGetTimeouts */

-    CARD16	length B16;

-} xDPMSGetTimeoutsReq;

-#define sz_xDPMSGetTimeoutsReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	standby B16;

-    CARD16	suspend B16;

-    CARD16	off B16;

-    CARD16	pad1 B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xDPMSGetTimeoutsReply;

-#define sz_xDPMSGetTimeoutsReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSSetTimeouts */

-    CARD16	length B16;

-    CARD16	standby B16;

-    CARD16	suspend B16;

-    CARD16	off B16;

-    CARD16	pad0 B16;

-} xDPMSSetTimeoutsReq;

-#define sz_xDPMSSetTimeoutsReq 12

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSEnable */

-    CARD16	length B16;

-} xDPMSEnableReq;

-#define sz_xDPMSEnableReq 4

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSDisable */

-    CARD16	length B16;

-} xDPMSDisableReq;

-#define sz_xDPMSDisableReq 4

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSForceLevel */

-    CARD16	length B16;

-    CARD16	level B16;	/* power level requested */

-    CARD16	pad0 B16;

-} xDPMSForceLevelReq;

-#define sz_xDPMSForceLevelReq 8

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSInfo */

-    CARD16	length B16;

-} xDPMSInfoReq;

-#define sz_xDPMSInfoReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	power_level B16;

-    BOOL	state;

-    CARD8	pad1;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xDPMSInfoReply;

-#define sz_xDPMSInfoReply 32

-

-#endif /* _DPMSPROTO_H_ */

+/*****************************************************************
+
+Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+#ifndef _DPMSPROTO_H_
+#define _DPMSPROTO_H_
+
+#include <X11/extensions/dpmsconst.h>
+
+#define X_DPMSGetVersion	0
+#define X_DPMSCapable		1
+#define X_DPMSGetTimeouts	2
+#define X_DPMSSetTimeouts	3
+#define X_DPMSEnable		4
+#define X_DPMSDisable		5
+#define X_DPMSForceLevel       	6
+#define X_DPMSInfo       	7
+
+#define DPMSNumberEvents	0
+
+#define DPMSNumberErrors	0
+
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSGetVersion */
+    CARD16	length B16;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+} xDPMSGetVersionReq;
+#define sz_xDPMSGetVersionReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xDPMSGetVersionReply;
+#define sz_xDPMSGetVersionReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSCapable */
+    CARD16	length B16;
+} xDPMSCapableReq;
+#define sz_xDPMSCapableReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	capable;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xDPMSCapableReply;
+#define sz_xDPMSCapableReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSGetTimeouts */
+    CARD16	length B16;
+} xDPMSGetTimeoutsReq;
+#define sz_xDPMSGetTimeoutsReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	standby B16;
+    CARD16	suspend B16;
+    CARD16	off B16;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xDPMSGetTimeoutsReply;
+#define sz_xDPMSGetTimeoutsReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSSetTimeouts */
+    CARD16	length B16;
+    CARD16	standby B16;
+    CARD16	suspend B16;
+    CARD16	off B16;
+    CARD16	pad0 B16;
+} xDPMSSetTimeoutsReq;
+#define sz_xDPMSSetTimeoutsReq 12
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSEnable */
+    CARD16	length B16;
+} xDPMSEnableReq;
+#define sz_xDPMSEnableReq 4
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSDisable */
+    CARD16	length B16;
+} xDPMSDisableReq;
+#define sz_xDPMSDisableReq 4
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSForceLevel */
+    CARD16	length B16;
+    CARD16	level B16;	/* power level requested */
+    CARD16	pad0 B16;
+} xDPMSForceLevelReq;
+#define sz_xDPMSForceLevelReq 8
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSInfo */
+    CARD16	length B16;
+} xDPMSInfoReq;
+#define sz_xDPMSInfoReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	power_level B16;
+    BOOL	state;
+    CARD8	pad1;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xDPMSInfoReply;
+#define sz_xDPMSInfoReply 32
+
+#endif /* _DPMSPROTO_H_ */