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

diff --git a/xorg-server/dix/buildatoms b/xorg-server/dix/buildatoms
index efc61b6f9..dfbbca8a9 100644
--- a/xorg-server/dix/buildatoms
+++ b/xorg-server/dix/buildatoms
@@ -1,43 +1,43 @@
-#!/bin/sh

-hfile=../../../include/Xatom.h

-cfile=initatoms.c

-rm -f $hfile $cfile

-umask 222

-awk '

-BEGIN {

-	hfile = "'$hfile'";

-	cfile = "'$cfile'";

-	hformat = "#define XA_%s ((Atom) %d)\n";

-	printf("#ifndef XATOM_H\n") > hfile;

-	printf("#define XATOM_H 1\n\n") > hfile;

-	printf("/* THIS IS A GENERATED FILE\n") > hfile;

-	printf(" *\n") > hfile;

-	printf(" * Do not change!  Changing this file implies a protocol change!\n") > hfile;

-	printf(" */\n\n") > hfile;

-

-	printf("/* THIS IS A GENERATED FILE\n") > cfile;

-	printf(" *\n") > cfile;

-	printf(" * Do not change!  Changing this file implies a protocol change!\n") > cfile;

-	printf(" */\n\n") > cfile;

-	printf("#include \"X.h\"\n") > cfile;

-	printf("#include \"Xatom.h\"\n") > cfile;

-	printf("#include \"misc.h\"\n") > cfile;

-	printf("#include \"dix.h\"\n") > cfile;

-	printf("void MakePredeclaredAtoms()\n") > cfile;

-	printf("{\n") > cfile;

-

-	}

-

-NF == 2 && $2 == "@" {

-	printf(hformat, $1, ++atomno) > hfile ;

-	printf("    if (MakeAtom(\"%s\", %d, 1) != XA_%s) AtomError();\n", $1, length($1), $1) > cfile ;

-	}

-

-END {

-	printf("\n") > hfile;

-	printf(hformat, "LAST_PREDEFINED", atomno) > hfile ;

-	printf("#endif /* XATOM_H */\n") > hfile;

-	printf("}\n") > cfile ;

-	}

-' BuiltInAtoms

-exit 0

+#!/bin/sh
+hfile=../../../include/Xatom.h
+cfile=initatoms.c
+rm -f $hfile $cfile
+umask 222
+awk '
+BEGIN {
+	hfile = "'$hfile'";
+	cfile = "'$cfile'";
+	hformat = "#define XA_%s ((Atom) %d)\n";
+	printf("#ifndef XATOM_H\n") > hfile;
+	printf("#define XATOM_H 1\n\n") > hfile;
+	printf("/* THIS IS A GENERATED FILE\n") > hfile;
+	printf(" *\n") > hfile;
+	printf(" * Do not change!  Changing this file implies a protocol change!\n") > hfile;
+	printf(" */\n\n") > hfile;
+
+	printf("/* THIS IS A GENERATED FILE\n") > cfile;
+	printf(" *\n") > cfile;
+	printf(" * Do not change!  Changing this file implies a protocol change!\n") > cfile;
+	printf(" */\n\n") > cfile;
+	printf("#include \"X.h\"\n") > cfile;
+	printf("#include \"Xatom.h\"\n") > cfile;
+	printf("#include \"misc.h\"\n") > cfile;
+	printf("#include \"dix.h\"\n") > cfile;
+	printf("void MakePredeclaredAtoms()\n") > cfile;
+	printf("{\n") > cfile;
+
+	}
+
+NF == 2 && $2 == "@" {
+	printf(hformat, $1, ++atomno) > hfile ;
+	printf("    if (MakeAtom(\"%s\", %d, 1) != XA_%s) AtomError();\n", $1, length($1), $1) > cfile ;
+	}
+
+END {
+	printf("\n") > hfile;
+	printf(hformat, "LAST_PREDEFINED", atomno) > hfile ;
+	printf("#endif /* XATOM_H */\n") > hfile;
+	printf("}\n") > cfile ;
+	}
+' BuiltInAtoms
+exit 0