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

diff --git a/libxcb/README b/libxcb/README
index cb830a436..167c8aca6 100644
--- a/libxcb/README
+++ b/libxcb/README
@@ -1,36 +1,36 @@
-About libxcb

-============

-

-libxcb provides an interface to the X Window System protocol, which

-replaces the current Xlib interface. It has several advantages over

-Xlib, including:

-- size: small, simple library, and lower memory footprint

-- latency hiding: batch several requests and wait for the replies later

-- direct protocol access: interface and protocol correspond exactly

-- proven thread support: transparently access XCB from multiple threads

-- easy extension implementation: interfaces auto-generated from XML-XCB

-

-Xlib can also use XCB as a transport layer, allowing software to make

-requests and receive responses with both, which eases porting to XCB.

-However, client programs, libraries, and toolkits will gain the most

-benefit from a native XCB port.

-

-

-Please report any issues you find to the freedesktop.org bug tracker,

-at:

-

-	<https://bugs.freedesktop.org/enter_bug.cgi?product=XCB>

-

-Discussion about XCB occurs on the XCB mailing list:

-

-        <mailto:xcb at lists.freedesktop.org>

-        <http://lists.freedesktop.org/mailman/listinfo/xcb>

-

-You can obtain the latest development versions of XCB using GIT.

-For anonymous checkouts, use:

-

-        git clone git://anongit.freedesktop.org/git/xcb/libxcb

-

-For developers, use:

-

-        git clone git+ssh://git.freedesktop.org/git/xcb/libxcb

+About libxcb
+============
+
+libxcb provides an interface to the X Window System protocol, which
+replaces the current Xlib interface. It has several advantages over
+Xlib, including:
+- size: small, simple library, and lower memory footprint
+- latency hiding: batch several requests and wait for the replies later
+- direct protocol access: interface and protocol correspond exactly
+- proven thread support: transparently access XCB from multiple threads
+- easy extension implementation: interfaces auto-generated from XML-XCB
+
+Xlib can also use XCB as a transport layer, allowing software to make
+requests and receive responses with both, which eases porting to XCB.
+However, client programs, libraries, and toolkits will gain the most
+benefit from a native XCB port.
+
+
+Please report any issues you find to the freedesktop.org bug tracker,
+at:
+
+	<https://bugs.freedesktop.org/enter_bug.cgi?product=XCB>
+
+Discussion about XCB occurs on the XCB mailing list:
+
+        <mailto:xcb at lists.freedesktop.org>
+        <http://lists.freedesktop.org/mailman/listinfo/xcb>
+
+You can obtain the latest development versions of XCB using GIT.
+For anonymous checkouts, use:
+
+        git clone git://anongit.freedesktop.org/git/xcb/libxcb
+
+For developers, use:
+
+        git clone git+ssh://git.freedesktop.org/git/xcb/libxcb