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

diff --git a/libxcb/tests/Makefile.am b/libxcb/tests/Makefile.am
index 93fd03d9b..077681e51 100644
--- a/libxcb/tests/Makefile.am
+++ b/libxcb/tests/Makefile.am
@@ -1,32 +1,32 @@
-########################

-## tests/Makefile.am

-########################

-SUBDIRS = 

-EXTRA_DIST = CheckLog.xsl

-AM_MAKEFLAGS = -k

-AM_CFLAGS = -Wall -Werror @CHECK_CFLAGS@ -I$(top_srcdir)/src

-LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la

-

-if HAVE_CHECK

-TESTS = check_all

-check_PROGRAMS = check_all

-check_all_SOURCES =  check_all.c check_suites.h check_public.c

-

-all-local::

-	$(RM) CheckLog*.xml

-

-check-local: check-TESTS

-	$(RM) CheckLog.html

-	if test x$(HTML_CHECK_RESULT) = xtrue; then \

-		$(XSLTPROC) $(srcdir)/CheckLog.xsl CheckLog*.xml > CheckLog.html; \

-	else \

-		touch CheckLog.html; \

-	fi

-

-CheckLog.html: $(check_PROGRAMS)

-	$(MAKE) $(AM_MAKEFLAGS) check;

-

-endif

-

-clean-local::

-	$(RM) CheckLog.html CheckLog*.txt CheckLog*.xml

+########################
+## tests/Makefile.am
+########################
+SUBDIRS = 
+EXTRA_DIST = CheckLog.xsl
+AM_MAKEFLAGS = -k
+AM_CFLAGS = -Wall -Werror @CHECK_CFLAGS@ -I$(top_srcdir)/src
+LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la
+
+if HAVE_CHECK
+TESTS = check_all
+check_PROGRAMS = check_all
+check_all_SOURCES =  check_all.c check_suites.h check_public.c
+
+all-local::
+	$(RM) CheckLog*.xml
+
+check-local: check-TESTS
+	$(RM) CheckLog.html
+	if test x$(HTML_CHECK_RESULT) = xtrue; then \
+		$(XSLTPROC) $(srcdir)/CheckLog.xsl CheckLog*.xml > CheckLog.html; \
+	else \
+		touch CheckLog.html; \
+	fi
+
+CheckLog.html: $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check;
+
+endif
+
+clean-local::
+	$(RM) CheckLog.html CheckLog*.txt CheckLog*.xml