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

diff --git a/xorg-server/xkeyboard-config/po/Makevars b/xorg-server/xkeyboard-config/po/Makevars
index 45916d2bb..03f092c96 100644
--- a/xorg-server/xkeyboard-config/po/Makevars
+++ b/xorg-server/xkeyboard-config/po/Makevars
@@ -1,41 +1,41 @@
-# Makefile variables for PO directory in any package using GNU gettext.

-

-# Usually the message domain is the same as the package name.

-DOMAIN = $(PACKAGE)

-

-# These two variables depend on the location of this directory.

-subdir = po

-top_builddir = ..

-

-# These options get passed to xgettext.

-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_

-

-# This is the copyright holder that gets inserted into the header of the

-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

-# package.  (Note that the msgstr strings, extracted from the package's

-# sources, belong to the copyright holder of the package.)  Translators are

-# expected to transfer the copyright for their translations to this person

-# or entity, or to disclaim their copyright.  The empty string stands for

-# the public domain; in this case the translators are expected to disclaim

-# their copyright.

-COPYRIGHT_HOLDER = XFree86

-

-# This is the email address or URL to which the translators shall report

-# bugs in the untranslated strings:

-# - Strings which are not entire sentences, see the maintainer guidelines

-#   in the GNU gettext documentation, section 'Preparing Strings'.

-# - Strings which use unclear terms or require additional context to be

-#   understood.

-# - Strings which make invalid assumptions about notation of date, time or

-#   money.

-# - Pluralisation problems.

-# - Incorrect English spelling.

-# - Incorrect formatting.

-# It can be your email address, or a mailing list address where translators

-# can write to without being subscribed, or the URL of a web page through

-# which the translators can contact you.

-MSGID_BUGS_ADDRESS = svu@users.sourceforge.net

-

-# This is the list of locale categories, beyond LC_MESSAGES, for which the

-# message catalogs shall be used.  It is usually empty.

-EXTRA_LOCALE_CATEGORIES =

+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = XFree86
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = svu@users.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =