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

diff --git a/libX11/src/util/mkks.sh b/libX11/src/util/mkks.sh
index 3e80c354b..262cc9540 100644
--- a/libX11/src/util/mkks.sh
+++ b/libX11/src/util/mkks.sh
@@ -1,11 +1,11 @@
-#!/bin/sh

-

-cat $* | awk 'BEGIN { \

-    printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \

-	   "$(INCLUDESRC)/keysymdef.h";\

-} \

-/^#define/ { \

-	len = length($2)-3; \

-	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \

-}' 

-

+#!/bin/sh
+
+cat $* | awk 'BEGIN { \
+    printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \
+	   "$(INCLUDESRC)/keysymdef.h";\
+} \
+/^#define/ { \
+	len = length($2)-3; \
+	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
+}' 
+