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

diff --git a/libX11/src/Xintatom.h b/libX11/src/Xintatom.h
index ba344f7f9..82dba36e1 100644
--- a/libX11/src/Xintatom.h
+++ b/libX11/src/Xintatom.h
@@ -1,32 +1,32 @@
-

-#ifndef _XINTATOM_H_

-#define _XINTATOM_H_ 1

-

-#include <X11/Xfuncproto.h>

-

-/* IntAtom.c */

-

-#define TABLESIZE 64

-

-typedef struct _Entry {

-    unsigned long sig;

-    Atom atom;

-} EntryRec, *Entry;

-

-#define RESERVED ((Entry) 1)

-

-#define EntryName(e) ((char *)(e+1))

-

-typedef struct _XDisplayAtoms {

-    Entry table[TABLESIZE];

-} AtomTable;

-

-_XFUNCPROTOBEGIN

-

-extern void _XUpdateAtomCache(Display *dpy, const char *name, Atom atom,

-				unsigned long sig, int idx, int n);

-extern void _XFreeAtomTable(Display *dpy);

-

-_XFUNCPROTOEND

-

-#endif /* _XINTATOM_H_ */

+
+#ifndef _XINTATOM_H_
+#define _XINTATOM_H_ 1
+
+#include <X11/Xfuncproto.h>
+
+/* IntAtom.c */
+
+#define TABLESIZE 64
+
+typedef struct _Entry {
+    unsigned long sig;
+    Atom atom;
+} EntryRec, *Entry;
+
+#define RESERVED ((Entry) 1)
+
+#define EntryName(e) ((char *)(e+1))
+
+typedef struct _XDisplayAtoms {
+    Entry table[TABLESIZE];
+} AtomTable;
+
+_XFUNCPROTOBEGIN
+
+extern void _XUpdateAtomCache(Display *dpy, const char *name, Atom atom,
+				unsigned long sig, int idx, int n);
+extern void _XFreeAtomTable(Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif /* _XINTATOM_H_ */