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

9 files changed, 158 insertions, 158 deletions

diff --git a/libXinerama/.gitignore b/libXinerama/.gitignore
index 3c327ee35..a9a016414 100644
--- a/libXinerama/.gitignore
+++ b/libXinerama/.gitignore
@@ -1,78 +1,78 @@
-#

-#		X.Org module default exclusion patterns

-#		The next section if for module specific patterns

-#

-#	Do not edit the following section

-# 	GNU Build System (Autotools)

-aclocal.m4

-autom4te.cache/

-autoscan.log

-ChangeLog

-compile

-config.guess

-config.h

-config.h.in

-config.log

-config-ml.in

-config.py

-config.status

-config.status.lineno

-config.sub

-configure

-configure.scan

-depcomp

-.deps/

-INSTALL

-install-sh

-.libs/

-libtool

-libtool.m4

-ltmain.sh

-lt~obsolete.m4

-ltoptions.m4

-ltsugar.m4

-ltversion.m4

-Makefile

-Makefile.in

-mdate-sh

-missing

-mkinstalldirs

-*.pc

-py-compile

-stamp-h?

-symlink-tree

-texinfo.tex

-ylwrap

-

-#	Do not edit the following section

-# 	Edit Compile Debug Document Distribute

-*~

-*.[0-9]

-*.[0-9]x

-*.bak

-*.bin

-core

-*.dll

-*.exe

-*-ISO*.bdf

-*-JIS*.bdf

-*-KOI8*.bdf

-*.kld

-*.ko

-*.ko.cmd

-*.lai

-*.l[oa]

-*.[oa]

-*.obj

-*.patch

-*.so

-*.pcf.gz

-*.pdb

-*.tar.bz2

-*.tar.gz

-#

-#		Add & Override patterns for libXinerama 

-#

-#		Edit the following section as needed

-# For example, !report.pc overrides *.pc. See 'man gitignore'

-# 

+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
+aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
+missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for libXinerama 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
diff --git a/libXinerama/README b/libXinerama/README
index f86ceae96..397233598 100644
--- a/libXinerama/README
+++ b/libXinerama/README
@@ -1,25 +1,25 @@
-libXinerama - API for Xinerama extension to X11 Protocol

-

-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/libXinerama

-

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

-

-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

-

+libXinerama - API for Xinerama extension to X11 Protocol
+
+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/libXinerama
+
+        http://cgit.freedesktop.org/xorg/lib/libXinerama
+
+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
+
diff --git a/libXinerama/autogen.sh b/libXinerama/autogen.sh
index 6fcae015c..904cd6746 100644
--- a/libXinerama/autogen.sh
+++ b/libXinerama/autogen.sh
@@ -1,12 +1,12 @@
-#! /bin/sh

-

-srcdir=`dirname $0`

-test -z "$srcdir" && srcdir=.

-

-ORIGDIR=`pwd`

-cd $srcdir

-

-autoreconf -v --install || exit 1

-cd $ORIGDIR || exit $?

-

-$srcdir/configure --enable-maintainer-mode "$@"

+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/libXinerama/man/XineramaIsActive.man b/libXinerama/man/XineramaIsActive.man
index a4f83321b..bf86f34ae 100644
--- a/libXinerama/man/XineramaIsActive.man
+++ b/libXinerama/man/XineramaIsActive.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xinerama.__libmansuffix__

+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryExtension.man b/libXinerama/man/XineramaQueryExtension.man
index a4f83321b..bf86f34ae 100644
--- a/libXinerama/man/XineramaQueryExtension.man
+++ b/libXinerama/man/XineramaQueryExtension.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xinerama.__libmansuffix__

+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryScreens.man b/libXinerama/man/XineramaQueryScreens.man
index a4f83321b..bf86f34ae 100644
--- a/libXinerama/man/XineramaQueryScreens.man
+++ b/libXinerama/man/XineramaQueryScreens.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xinerama.__libmansuffix__

+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryVersion.man b/libXinerama/man/XineramaQueryVersion.man
index a4f83321b..bf86f34ae 100644
--- a/libXinerama/man/XineramaQueryVersion.man
+++ b/libXinerama/man/XineramaQueryVersion.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xinerama.__libmansuffix__

+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/src/Makefile.am b/libXinerama/src/Makefile.am
index cac6fd6d0..c362ef187 100644
--- a/libXinerama/src/Makefile.am
+++ b/libXinerama/src/Makefile.am
@@ -1,27 +1,27 @@
-AM_CFLAGS = -I$(top_srcdir)/include \

-            -I$(top_srcdir)/include/X11 \

-            -I$(top_srcdir)/include/X11/extensions \

-            $(XINERAMA_CFLAGS) \

-            $(MALLOC_ZERO_CFLAGS) \

-            $(CWARNFLAGS)

-

-lib_LTLIBRARIES = libXinerama.la

-

-libXinerama_la_SOURCES = \

-         Xinerama.c

-

-libXinerama_la_LIBADD = $(XINERAMA_LIBS)

-

-libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined

-

-libXineramaincludedir = $(includedir)/X11/extensions

-libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \

-                             $(top_srcdir)/include/X11/extensions/panoramiXext.h

-

-if LINT

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-		$(AM_CPPFLAGS) $(CPPFLAGS)

-

-lint:

-	$(LINT) $(ALL_LINT_FLAGS) $(libXinerama_la_SOURCES) $(XINERAMA_LIBS)

-endif LINT

+AM_CFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/include/X11 \
+            -I$(top_srcdir)/include/X11/extensions \
+            $(XINERAMA_CFLAGS) \
+            $(MALLOC_ZERO_CFLAGS) \
+            $(CWARNFLAGS)
+
+lib_LTLIBRARIES = libXinerama.la
+
+libXinerama_la_SOURCES = \
+         Xinerama.c
+
+libXinerama_la_LIBADD = $(XINERAMA_LIBS)
+
+libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
+libXineramaincludedir = $(includedir)/X11/extensions
+libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \
+                             $(top_srcdir)/include/X11/extensions/panoramiXext.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(libXinerama_la_SOURCES) $(XINERAMA_LIBS)
+endif LINT
diff --git a/libXinerama/xinerama.pc.in b/libXinerama/xinerama.pc.in
index f36049764..a2ffe1b3f 100644
--- a/libXinerama/xinerama.pc.in
+++ b/libXinerama/xinerama.pc.in
@@ -1,12 +1,12 @@
-prefix=@prefix@

-exec_prefix=@exec_prefix@

-libdir=@libdir@

-includedir=@includedir@

-

-Name: Xinerama

-Description: The Xinerama Library

-Version: @PACKAGE_VERSION@

-Requires: xineramaproto

-Requires.private: x11 xext

-Cflags: -I${includedir}

-Libs: -L${libdir} -lXinerama

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xinerama
+Description: The Xinerama Library
+Version: @PACKAGE_VERSION@
+Requires: xineramaproto
+Requires.private: x11 xext
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXinerama