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

diff --git a/xorg-server/config/10-evdev.conf b/xorg-server/config/10-evdev.conf
index 144110846..cc83ab232 100644
--- a/xorg-server/config/10-evdev.conf
+++ b/xorg-server/config/10-evdev.conf
@@ -1,40 +1,40 @@
-#

-# Catch-all evdev loader for udev-based systems

-# We don't simply match on any device since that also adds accelerometers

-# and other devices that we don't really want to use. The list below

-# matches everything but joysticks.

-

-Section "InputClass"

-        Identifier "evdev pointer catchall"

-        MatchIsPointer "on"

-        MatchDevicePath "/dev/input/event*"

-        Driver "evdev"

-EndSection

-

-Section "InputClass"

-        Identifier "evdev keyboard catchall"

-        MatchIsKeyboard "on"

-        MatchDevicePath "/dev/input/event*"

-        Driver "evdev"

-EndSection

-

-Section "InputClass"

-        Identifier "evdev touchpad catchall"

-        MatchIsTouchpad "on"

-        MatchDevicePath "/dev/input/event*"

-        Driver "evdev"

-EndSection

-

-Section "InputClass"

-        Identifier "evdev tablet catchall"

-        MatchIsTablet "on"

-        MatchDevicePath "/dev/input/event*"

-        Driver "evdev"

-EndSection

-

-Section "InputClass"

-        Identifier "evdev touchscreen catchall"

-        MatchIsTouchscreen "on"

-        MatchDevicePath "/dev/input/event*"

-        Driver "evdev"

-EndSection

+#
+# Catch-all evdev loader for udev-based systems
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev tablet catchall"
+        MatchIsTablet "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection