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

diff --git a/xorg-server/fix-miregion b/xorg-server/fix-miregion
index 7aea689b7..fc502bbfd 100644
--- a/xorg-server/fix-miregion
+++ b/xorg-server/fix-miregion
@@ -1,29 +1,29 @@
-#!/bin/sh

-sed -i \

--e 's/miRegionCreate\b/RegionCreate/g' \

--e 's/miRegionInit\b/RegionInit/g' \

--e 's/miRegionDestroy\b/RegionDestroy/g' \

--e 's/miRegionUninit\b/RegionUninit/g' \

--e 's/miRegionCopy\b/RegionCopy/g' \

--e 's/miIntersect\b/RegionIntersect/g' \

--e 's/miUnion\b/RegionUnion/g' \

--e 's/miRegionAppend\b/RegionAppend/g' \

--e 's/miRegionValidate\b/RegionValidate/g' \

--e 's/miRectsToRegion\b/RegionFromRects/g' \

--e 's/miSubtract\b/RegionSubtract/g' \

--e 's/miInverse\b/RegionInverse/g' \

--e 's/miRectIn\b/RegionContainsRect/g' \

--e 's/miTranslateRegion\b/RegionTranslate/g' \

--e 's/miRegionReset\b/RegionReset/g' \

--e 's/miRegionBreak\b/RegionBreak/g' \

--e 's/miPointInRegion\b/RegionContainsPoint/g' \

--e 's/miRegionEqual\b/RegionEqual/g' \

--e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \

--e 's/miRegionEmpty\b/RegionEmpty/g' \

--e 's/miRegionExtents\b/RegionExtents/g' \

--e 's/miPrintRegion\b/RegionPrint/g' \

--e 's/miRectAlloc\b/RegionRectAlloc/g' \

--e 's/miValidRegion\b/RegionIsValid/g' \

--e 's/miRegionBroken\b/RegionBroken/g' \

--e 's/miClipSpans\b/RegionClipSpans/g' \

-"$@"

+#!/bin/sh
+sed -i \
+-e 's/miRegionCreate\b/RegionCreate/g' \
+-e 's/miRegionInit\b/RegionInit/g' \
+-e 's/miRegionDestroy\b/RegionDestroy/g' \
+-e 's/miRegionUninit\b/RegionUninit/g' \
+-e 's/miRegionCopy\b/RegionCopy/g' \
+-e 's/miIntersect\b/RegionIntersect/g' \
+-e 's/miUnion\b/RegionUnion/g' \
+-e 's/miRegionAppend\b/RegionAppend/g' \
+-e 's/miRegionValidate\b/RegionValidate/g' \
+-e 's/miRectsToRegion\b/RegionFromRects/g' \
+-e 's/miSubtract\b/RegionSubtract/g' \
+-e 's/miInverse\b/RegionInverse/g' \
+-e 's/miRectIn\b/RegionContainsRect/g' \
+-e 's/miTranslateRegion\b/RegionTranslate/g' \
+-e 's/miRegionReset\b/RegionReset/g' \
+-e 's/miRegionBreak\b/RegionBreak/g' \
+-e 's/miPointInRegion\b/RegionContainsPoint/g' \
+-e 's/miRegionEqual\b/RegionEqual/g' \
+-e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \
+-e 's/miRegionEmpty\b/RegionEmpty/g' \
+-e 's/miRegionExtents\b/RegionExtents/g' \
+-e 's/miPrintRegion\b/RegionPrint/g' \
+-e 's/miRectAlloc\b/RegionRectAlloc/g' \
+-e 's/miValidRegion\b/RegionIsValid/g' \
+-e 's/miRegionBroken\b/RegionBroken/g' \
+-e 's/miClipSpans\b/RegionClipSpans/g' \
+"$@"