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

diff --git a/libX11/include/X11/ImUtil.h b/libX11/include/X11/ImUtil.h
index b7f425c93..ffdba1a93 100644
--- a/libX11/include/X11/ImUtil.h
+++ b/libX11/include/X11/ImUtil.h
@@ -1,30 +1,30 @@
-

-#ifndef _X11_IMUTIL_H_

-#define _X11_IMUTIL_H_

-

-extern int

-_XGetScanlinePad(

-    Display *dpy,

-    int depth);

-

-extern int

-_XGetBitsPerPixel(

- Display *dpy,

- int depth);

-

-extern int

-_XSetImage(

-    XImage *srcimg,

-    register XImage *dstimg,

-    register int x,

-    register int y);

-

-extern int

-_XReverse_Bytes(

-    register unsigned char *bpt,

-    register int nb);

-extern void

-_XInitImageFuncPtrs(

-    register XImage *image);

-

-#endif /* _X11_IMUTIL_H_ */

+
+#ifndef _X11_IMUTIL_H_
+#define _X11_IMUTIL_H_
+
+extern int
+_XGetScanlinePad(
+    Display *dpy,
+    int depth);
+
+extern int
+_XGetBitsPerPixel(
+ Display *dpy,
+ int depth);
+
+extern int
+_XSetImage(
+    XImage *srcimg,
+    register XImage *dstimg,
+    register int x,
+    register int y);
+
+extern int
+_XReverse_Bytes(
+    register unsigned char *bpt,
+    register int nb);
+extern void
+_XInitImageFuncPtrs(
+    register XImage *image);
+
+#endif /* _X11_IMUTIL_H_ */