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

4 files changed, 113 insertions, 113 deletions

diff --git a/xorg-server/xkeyboard-config/keycodes/README b/xorg-server/xkeyboard-config/keycodes/README
index 31e061861..6363f3d55 100644
--- a/xorg-server/xkeyboard-config/keycodes/README
+++ b/xorg-server/xkeyboard-config/keycodes/README
@@ -1,6 +1,6 @@
-The keycodes component of a keyboard mapping specifies the range and

-interpretation of the raw keycodes reported by the device. It sets the keycodes

-symbolic name, the minimum and maximum legal codes for the keyboard, and the

-symbolic name for each key. The keycodes component might also contain aliases

-for some keys, symbolic names for some indicators and a description of which

-indicators are physically present.

+The keycodes component of a keyboard mapping specifies the range and
+interpretation of the raw keycodes reported by the device. It sets the keycodes
+symbolic name, the minimum and maximum legal codes for the keyboard, and the
+symbolic name for each key. The keycodes component might also contain aliases
+for some keys, symbolic names for some indicators and a description of which
+indicators are physically present.
diff --git a/xorg-server/xkeyboard-config/keycodes/aliases b/xorg-server/xkeyboard-config/keycodes/aliases
index d80493f95..f398772fe 100644
--- a/xorg-server/xkeyboard-config/keycodes/aliases
+++ b/xorg-server/xkeyboard-config/keycodes/aliases
@@ -1,99 +1,99 @@
-

-// keycode aliases for phonetic keyboard maps

-

-default

-xkb_keycodes "qwerty" {

-

-   alias <LatQ> = <AD01>;

-   alias <LatW> = <AD02>;

-   alias <LatE> = <AD03>;

-   alias <LatR> = <AD04>;

-   alias <LatT> = <AD05>;

-   alias <LatY> = <AD06>;

-   alias <LatU> = <AD07>;

-   alias <LatI> = <AD08>;

-   alias <LatO> = <AD09>;

-   alias <LatP> = <AD10>;

-

-   alias <LatA> = <AC01>;

-   alias <LatS> = <AC02>;

-   alias <LatD> = <AC03>;

-   alias <LatF> = <AC04>;

-   alias <LatG> = <AC05>;

-   alias <LatH> = <AC06>;

-   alias <LatJ> = <AC07>;

-   alias <LatK> = <AC08>;

-   alias <LatL> = <AC09>;

-

-   alias <LatZ> = <AB01>;

-   alias <LatX> = <AB02>;

-   alias <LatC> = <AB03>;

-   alias <LatV> = <AB04>;

-   alias <LatB> = <AB05>;

-   alias <LatN> = <AB06>;

-   alias <LatM> = <AB07>;

-};

-

-xkb_keycodes "azerty" {

-

-   alias <LatA> = <AD01>;

-   alias <LatZ> = <AD02>;

-   alias <LatE> = <AD03>;

-   alias <LatR> = <AD04>;

-   alias <LatT> = <AD05>;

-   alias <LatY> = <AD06>;

-   alias <LatU> = <AD07>;

-   alias <LatI> = <AD08>;

-   alias <LatO> = <AD09>;

-   alias <LatP> = <AD10>;

-

-   alias <LatQ> = <AC01>;

-   alias <LatS> = <AC02>;

-   alias <LatD> = <AC03>;

-   alias <LatF> = <AC04>;

-   alias <LatG> = <AC05>;

-   alias <LatH> = <AC06>;

-   alias <LatJ> = <AC07>;

-   alias <LatK> = <AC08>;

-   alias <LatL> = <AC09>;

-   alias <LatM> = <AC10>;

-

-   alias <LatW> = <AB01>;

-   alias <LatX> = <AB02>;

-   alias <LatC> = <AB03>;

-   alias <LatV> = <AB04>;

-   alias <LatB> = <AB05>;

-   alias <LatN> = <AB06>;

-};

-

-xkb_keycodes "qwertz" {

-

-   alias <LatQ> = <AD01>;

-   alias <LatW> = <AD02>;

-   alias <LatE> = <AD03>;

-   alias <LatR> = <AD04>;

-   alias <LatT> = <AD05>;

-   alias <LatZ> = <AD06>;

-   alias <LatU> = <AD07>;

-   alias <LatI> = <AD08>;

-   alias <LatO> = <AD09>;

-   alias <LatP> = <AD10>;

-

-   alias <LatA> = <AC01>;

-   alias <LatS> = <AC02>;

-   alias <LatD> = <AC03>;

-   alias <LatF> = <AC04>;

-   alias <LatG> = <AC05>;

-   alias <LatH> = <AC06>;

-   alias <LatJ> = <AC07>;

-   alias <LatK> = <AC08>;

-   alias <LatL> = <AC09>;

-

-   alias <LatY> = <AB01>;

-   alias <LatX> = <AB02>;

-   alias <LatC> = <AB03>;

-   alias <LatV> = <AB04>;

-   alias <LatB> = <AB05>;

-   alias <LatN> = <AB06>;

-   alias <LatM> = <AB07>;

-};

+
+// keycode aliases for phonetic keyboard maps
+
+default
+xkb_keycodes "qwerty" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatZ> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
+
+xkb_keycodes "azerty" {
+
+   alias <LatA> = <AD01>;
+   alias <LatZ> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatQ> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+   alias <LatM> = <AC10>;
+
+   alias <LatW> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+};
+
+xkb_keycodes "qwertz" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatZ> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatY> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
index 9f94efa7c..4f4cc4fd9 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
@@ -1,4 +1,4 @@
-keycodesdir = $(xkb_base)/keycodes/digital_vndr

-

-dist_keycodes_DATA = \

-lk pc

+keycodesdir = $(xkb_base)/keycodes/digital_vndr
+
+dist_keycodes_DATA = \
+lk pc
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
index 5680fd8a5..f601268e2 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-keycodesdir = $(xkb_base)/keycodes/sgi_vndr

-

-dist_keycodes_DATA = \

-indigo indy iris

+keycodesdir = $(xkb_base)/keycodes/sgi_vndr
+
+dist_keycodes_DATA = \
+indigo indy iris