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

diff --git a/libfontenc/README b/libfontenc/README
index f4e90ac42..8a6658d49 100644
--- a/libfontenc/README
+++ b/libfontenc/README
@@ -1,25 +1,25 @@
-libfontenc - font encoding library

-

-All questions regarding this software should be directed at the

-Xorg mailing list:

-

-        http://lists.freedesktop.org/mailman/listinfo/xorg

-

-Please submit bug reports to the Xorg bugzilla:

-

-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg

-

-The master development code repository can be found at:

-

-        git://anongit.freedesktop.org/git/xorg/lib/libfontenc

-

-        http://cgit.freedesktop.org/xorg/lib/libfontenc

-

-For patch submission instructions, see:

-

-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches

-

-For more information on the git code manager, see:

-

-        http://wiki.x.org/wiki/GitPage

-

+libfontenc - font encoding library
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/lib/libfontenc
+
+        http://cgit.freedesktop.org/xorg/lib/libfontenc
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+