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

diff --git a/xorg-server/xkb/README.compiled b/xorg-server/xkb/README.compiled
index 66df26234..71caa2f63 100644
--- a/xorg-server/xkb/README.compiled
+++ b/xorg-server/xkb/README.compiled
@@ -1,13 +1,13 @@
-

-The X server uses this directory to store the compiled version of the

-current keymap and/or any scratch keymaps used by clients.  The X server

-or some other tool might destroy or replace the files in this directory,

-so it is not a safe place to store compiled keymaps for long periods of

-time.  The default keymap for any server is usually stored in:

-     X<num>-default.xkm

-where <num> is the display number of the server in question, which makes

-it possible for several servers *on the same host* to share the same 

-directory.

-

-Unless the X server is modified, sharing this directory between servers on

-different hosts could cause problems.

+
+The X server uses this directory to store the compiled version of the
+current keymap and/or any scratch keymaps used by clients.  The X server
+or some other tool might destroy or replace the files in this directory,
+so it is not a safe place to store compiled keymaps for long periods of
+time.  The default keymap for any server is usually stored in:
+     X<num>-default.xkm
+where <num> is the display number of the server in question, which makes
+it possible for several servers *on the same host* to share the same 
+directory.
+
+Unless the X server is modified, sharing this directory between servers on
+different hosts could cause problems.