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

diff --git a/libxcb/xcb-proto/src/xc_misc.xml b/libxcb/xcb-proto/src/xc_misc.xml
index b9b21ca48..139ca22f0 100644
--- a/libxcb/xcb-proto/src/xc_misc.xml
+++ b/libxcb/xcb-proto/src/xc_misc.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Mikko Torni and Josh Triplett.

-All Rights Reserved.  See the file COPYING in this directory

-for licensing information.

--->

-<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"

-    extension-multiword="true" major-version="1" minor-version="1">

-  <request name="GetVersion" opcode="0">

-    <field type="CARD16" name="client_major_version" />

-    <field type="CARD16" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="server_major_version" />

-      <field type="CARD16" name="server_minor_version" />

-    </reply>

-  </request>

-

-  <request name="GetXIDRange" opcode="1">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="start_id" />

-      <field type="CARD32" name="count" />

-    </reply>

-  </request>

-

-  <request name="GetXIDList" opcode="2">

-    <field type="CARD32" name="count" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="ids_len" />

-      <pad bytes="20" />

-      <list type="CARD32" name="ids">

-        <fieldref>ids_len</fieldref>

-      </list>

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Mikko Torni and Josh Triplett.
+All Rights Reserved.  See the file COPYING in this directory
+for licensing information.
+-->
+<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"
+    extension-multiword="true" major-version="1" minor-version="1">
+  <request name="GetVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major_version" />
+      <field type="CARD16" name="server_minor_version" />
+    </reply>
+  </request>
+
+  <request name="GetXIDRange" opcode="1">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="start_id" />
+      <field type="CARD32" name="count" />
+    </reply>
+  </request>
+
+  <request name="GetXIDList" opcode="2">
+    <field type="CARD32" name="count" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="ids_len" />
+      <pad bytes="20" />
+      <list type="CARD32" name="ids">
+        <fieldref>ids_len</fieldref>
+      </list>
+    </reply>
+  </request>
+</xcb>