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

diff --git a/xorg-server/fix-region b/xorg-server/fix-region
index e38022bf6..ef8eb4218 100644
--- a/xorg-server/fix-region
+++ b/xorg-server/fix-region
@@ -1,38 +1,38 @@
-#!/bin/sh

-sed -i \

-    -e 's/REGION_NIL\b/RegionNil/g' \

-    -e 's/REGION_NAR\b/RegionNar/g' \

-    -e 's/REGION_NUM_RECTS\b/RegionNumRects/g' \

-    -e 's/REGION_SIZE\b/RegionSize/g' \

-    -e 's/REGION_RECTS\b/RegionRects/g' \

-    -e 's/REGION_BOXPTR\b/RegionBoxptr/g' \

-    -e 's/REGION_BOX\b/RegionBox/g' \

-    -e 's/REGION_TOP\b/RegionTop/g' \

-    -e 's/REGION_END\b/RegionEnd/g' \

-    -e 's/REGION_SZOF\b/RegionSizeof/g' \

-    -e 's/REGION_CREATE *([^,]*, */RegionCreate(/g' \

-    -e 's/REGION_COPY *([^,]*, */RegionCopy(/g' \

-    -e 's/REGION_DESTROY *([^,]*, */RegionDestroy(/g' \

-    -e 's/REGION_INTERSECT *([^,]*, */RegionIntersect(/g' \

-    -e 's/REGION_UNION *([^,]*, */RegionUnion(/g' \

-    -e 's/REGION_SUBTRACT *([^,]*, */RegionSubtract(/g' \

-    -e 's/REGION_INVERSE *([^,]*, */RegionInverse(/g' \

-    -e 's/REGION_TRANSLATE *([^,]*, */RegionTranslate(/g' \

-    -e 's/RECT_IN_REGION *([^,]*, */RegionContainsRect(/g' \

-    -e 's/POINT_IN_REGION *([^,]*, */RegionContainsPoint(/g' \

-    -e 's/REGION_EQUAL *([^,]*, */RegionEqual(/g' \

-    -e 's/REGION_APPEND *([^,]*, */RegionAppend(/g' \

-    -e 's/REGION_VALIDATE *([^,]*, */RegionValidate(/g' \

-    -e 's/BITMAP_TO_REGION\b/BitmapToRegion/g' \

-    -e 's/RECTS_TO_REGION *([^,]*, */RegionFromRects(/g' \

-    -e 's/REGION_BREAK *([^,]*, */RegionBreak(/g' \

-    -e 's/REGION_INIT *([^,]*, */RegionInit(/g' \

-    -e 's/REGION_UNINIT *([^,]*, */RegionUninit(/g' \

-    -e 's/REGION_RESET *([^,]*, */RegionReset(/g' \

-    -e 's/REGION_NOTEMPTY *([^,]*, */RegionNotEmpty(/g' \

-    -e 's/REGION_BROKEN *([^,]*, */RegionBroken(/g' \

-    -e 's/REGION_EMPTY *([^,]*, */RegionEmpty(/g' \

-    -e 's/REGION_EXTENTS *([^,]*, */RegionExtents(/g' \

-    -e 's/REGION_NULL *([^,]*, */RegionNull(/g' \

-    -e 's/REGION_NULL$/RegionNull/g' \

-    "$@"

+#!/bin/sh
+sed -i \
+    -e 's/REGION_NIL\b/RegionNil/g' \
+    -e 's/REGION_NAR\b/RegionNar/g' \
+    -e 's/REGION_NUM_RECTS\b/RegionNumRects/g' \
+    -e 's/REGION_SIZE\b/RegionSize/g' \
+    -e 's/REGION_RECTS\b/RegionRects/g' \
+    -e 's/REGION_BOXPTR\b/RegionBoxptr/g' \
+    -e 's/REGION_BOX\b/RegionBox/g' \
+    -e 's/REGION_TOP\b/RegionTop/g' \
+    -e 's/REGION_END\b/RegionEnd/g' \
+    -e 's/REGION_SZOF\b/RegionSizeof/g' \
+    -e 's/REGION_CREATE *([^,]*, */RegionCreate(/g' \
+    -e 's/REGION_COPY *([^,]*, */RegionCopy(/g' \
+    -e 's/REGION_DESTROY *([^,]*, */RegionDestroy(/g' \
+    -e 's/REGION_INTERSECT *([^,]*, */RegionIntersect(/g' \
+    -e 's/REGION_UNION *([^,]*, */RegionUnion(/g' \
+    -e 's/REGION_SUBTRACT *([^,]*, */RegionSubtract(/g' \
+    -e 's/REGION_INVERSE *([^,]*, */RegionInverse(/g' \
+    -e 's/REGION_TRANSLATE *([^,]*, */RegionTranslate(/g' \
+    -e 's/RECT_IN_REGION *([^,]*, */RegionContainsRect(/g' \
+    -e 's/POINT_IN_REGION *([^,]*, */RegionContainsPoint(/g' \
+    -e 's/REGION_EQUAL *([^,]*, */RegionEqual(/g' \
+    -e 's/REGION_APPEND *([^,]*, */RegionAppend(/g' \
+    -e 's/REGION_VALIDATE *([^,]*, */RegionValidate(/g' \
+    -e 's/BITMAP_TO_REGION\b/BitmapToRegion/g' \
+    -e 's/RECTS_TO_REGION *([^,]*, */RegionFromRects(/g' \
+    -e 's/REGION_BREAK *([^,]*, */RegionBreak(/g' \
+    -e 's/REGION_INIT *([^,]*, */RegionInit(/g' \
+    -e 's/REGION_UNINIT *([^,]*, */RegionUninit(/g' \
+    -e 's/REGION_RESET *([^,]*, */RegionReset(/g' \
+    -e 's/REGION_NOTEMPTY *([^,]*, */RegionNotEmpty(/g' \
+    -e 's/REGION_BROKEN *([^,]*, */RegionBroken(/g' \
+    -e 's/REGION_EMPTY *([^,]*, */RegionEmpty(/g' \
+    -e 's/REGION_EXTENTS *([^,]*, */RegionExtents(/g' \
+    -e 's/REGION_NULL *([^,]*, */RegionNull(/g' \
+    -e 's/REGION_NULL$/RegionNull/g' \
+    "$@"