Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	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/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 99 insertions, 99 deletions

diff --git a/xorg-server/xkeyboard-config/keycodes/aliases b/xorg-server/xkeyboard-config/keycodes/aliases
index f398772fe..d80493f95 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>;

+};