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

diff --git a/libxcb/xcb-proto/README b/libxcb/xcb-proto/README
index 11ffe528a..22d7debca 100644
--- a/libxcb/xcb-proto/README
+++ b/libxcb/xcb-proto/README
@@ -1,47 +1,47 @@
-About xcb-proto

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

-

-xcb-proto provides the XML-XCB protocol descriptions that libxcb uses to

-generate the majority of its code and API. We provide them separately

-from libxcb to allow reuse by other projects, such as additional

-language bindings, protocol dissectors, or documentation generators.

-

-This separation between the XCB transport layer and the

-automatically-generated protocol layer also makes it far easier to write

-new extensions. With the Xlib infrastructure, client-side support for

-new extensions requires significant duplication of effort. With XCB and

-the XML-XCB protocol descriptions, client-side support for a new

-extension requires only an XML description of the extension, and not a

-single line of code.

-

-Python libraries: xcb-proto also contains language-independent Python

-libraries that are used to parse an XML description and create objects

-used by Python code generators in individual language bindings.  These

-libraries are installed into $(prefix)/lib/pythonX.X/site-packages.  If

-this location is not on your system's Python path, scripts that import

-them will fail with import errors.  In this case you must add the

-install location to your Python path by creating a file with a `.pth'

-extension in a directory that _is_ on the Python path, and put the

-path to the install location in that file.  For example, on my system

-there is a file named 'local.pth' in /usr/lib/python2.5/site-packages,

-which contains '/usr/local/lib/python2.5/site-packages'.  Note that 

-this is only necessary on machines where XCB is being built. 

-

-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/proto

-

-For developers, use:

-

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

+About xcb-proto
+===============
+
+xcb-proto provides the XML-XCB protocol descriptions that libxcb uses to
+generate the majority of its code and API. We provide them separately
+from libxcb to allow reuse by other projects, such as additional
+language bindings, protocol dissectors, or documentation generators.
+
+This separation between the XCB transport layer and the
+automatically-generated protocol layer also makes it far easier to write
+new extensions. With the Xlib infrastructure, client-side support for
+new extensions requires significant duplication of effort. With XCB and
+the XML-XCB protocol descriptions, client-side support for a new
+extension requires only an XML description of the extension, and not a
+single line of code.
+
+Python libraries: xcb-proto also contains language-independent Python
+libraries that are used to parse an XML description and create objects
+used by Python code generators in individual language bindings.  These
+libraries are installed into $(prefix)/lib/pythonX.X/site-packages.  If
+this location is not on your system's Python path, scripts that import
+them will fail with import errors.  In this case you must add the
+install location to your Python path by creating a file with a `.pth'
+extension in a directory that _is_ on the Python path, and put the
+path to the install location in that file.  For example, on my system
+there is a file named 'local.pth' in /usr/lib/python2.5/site-packages,
+which contains '/usr/local/lib/python2.5/site-packages'.  Note that 
+this is only necessary on machines where XCB is being built. 
+
+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/proto
+
+For developers, use:
+
+        git clone git+ssh://git.freedesktop.org/git/xcb/proto