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

diff --git a/libX11/include/Makefile.am b/libX11/include/Makefile.am
index bf8fcb954..067546cf0 100644
--- a/libX11/include/Makefile.am
+++ b/libX11/include/Makefile.am
@@ -1,19 +1,19 @@
-x11includedir=${includedir}/X11

-x11include_HEADERS=\

-	X11/XKBlib.h \

-	X11/Xcms.h \

-	X11/Xlib.h \

-	X11/Xlibint.h \

-	X11/Xlocale.h \

-	X11/Xresource.h \

-	X11/Xutil.h \

-	X11/cursorfont.h \

-	X11/Xregion.h \

-	X11/ImUtil.h \

-	X11/Xlib-xcb.h

-

-nodist_x11include_HEADERS=\

-	X11/XlibConf.h

-

-EXTRA_DIST = \

-	X11/XlibConf.h.in

+x11includedir=${includedir}/X11
+x11include_HEADERS=\
+	X11/XKBlib.h \
+	X11/Xcms.h \
+	X11/Xlib.h \
+	X11/Xlibint.h \
+	X11/Xlocale.h \
+	X11/Xresource.h \
+	X11/Xutil.h \
+	X11/cursorfont.h \
+	X11/Xregion.h \
+	X11/ImUtil.h \
+	X11/Xlib-xcb.h
+
+nodist_x11include_HEADERS=\
+	X11/XlibConf.h
+
+EXTRA_DIST = \
+	X11/XlibConf.h.in