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

diff --git a/libX11/src/Cr.h b/libX11/src/Cr.h
index d07266265..800c9ab1c 100644
--- a/libX11/src/Cr.h
+++ b/libX11/src/Cr.h
@@ -1,27 +1,27 @@
-

-#ifndef _CR_H_

-#define _CR_H_

-

-extern int _XUpdateGCCache(

-    register GC gc,

-    register unsigned long mask,

-    register XGCValues *attr);

-extern void _XNoticeCreateBitmap(

-    Display         *dpy,

-    Pixmap          pid,

-    unsigned int    width,

-    unsigned int    height);

-extern void _XNoticePutBitmap(

-    Display         *dpy,

-    Drawable        draw,

-    XImage          *image);

-extern Cursor _XTryShapeBitmapCursor(

-    Display         *dpy,

-    Pixmap          source,

-    Pixmap          mask,

-    XColor          *foreground,

-    XColor          *background,

-    unsigned int    x,

-    unsigned int    y);

-

-#endif /* _CR_H_ */

+
+#ifndef _CR_H_
+#define _CR_H_
+
+extern int _XUpdateGCCache(
+    register GC gc,
+    register unsigned long mask,
+    register XGCValues *attr);
+extern void _XNoticeCreateBitmap(
+    Display         *dpy,
+    Pixmap          pid,
+    unsigned int    width,
+    unsigned int    height);
+extern void _XNoticePutBitmap(
+    Display         *dpy,
+    Drawable        draw,
+    XImage          *image);
+extern Cursor _XTryShapeBitmapCursor(
+    Display         *dpy,
+    Pixmap          source,
+    Pixmap          mask,
+    XColor          *foreground,
+    XColor          *background,
+    unsigned int    x,
+    unsigned int    y);
+
+#endif /* _CR_H_ */