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

diff --git a/xorg-server/render/Makefile.am b/xorg-server/render/Makefile.am
index b060c07eb..d02028b3b 100644
--- a/xorg-server/render/Makefile.am
+++ b/xorg-server/render/Makefile.am
@@ -1,20 +1,20 @@
-noinst_LTLIBRARIES = librender.la

-

-AM_CFLAGS = $(DIX_CFLAGS)

-

-librender_la_SOURCES =	\

-	animcur.c	\

-	filter.c	\

-	glyph.c		\

-	matrix.c	\

-	miindex.c	\

-	mipict.c	\

-	mirect.c	\

-	mitrap.c	\

-	mitri.c		\

-	picture.c	\

-	render.c

-

-if XORG

-sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h

-endif

+noinst_LTLIBRARIES = librender.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+librender_la_SOURCES =	\
+	animcur.c	\
+	filter.c	\
+	glyph.c		\
+	matrix.c	\
+	miindex.c	\
+	mipict.c	\
+	mirect.c	\
+	mitrap.c	\
+	mitri.c		\
+	picture.c	\
+	render.c
+
+if XORG
+sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h
+endif