Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

1 files changed, 32 insertions, 32 deletions

diff --git a/xorg-server/hw/dmx/dmxgcops.h b/xorg-server/hw/dmx/dmxgcops.h
index da14d4d94..4ba0ad500 100644
--- a/xorg-server/hw/dmx/dmxgcops.h
+++ b/xorg-server/hw/dmx/dmxgcops.h
@@ -38,58 +38,58 @@
 #define DMXGCOPS_H
 
 extern void dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
-			 int nInit, DDXPointPtr pptInit, int *pwidthInit,
-			 int fSorted);
+                         int nInit, DDXPointPtr pptInit, int *pwidthInit,
+                         int fSorted);
 extern void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
-			char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
-			int fSorted);
+                        char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
+                        int fSorted);
 extern void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
-			int depth, int x, int y, int w, int h,
-			int leftPad, int format, char *pBits);
+                        int depth, int x, int y, int w, int h,
+                        int leftPad, int format, char *pBits);
 extern RegionPtr dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-			     int srcx, int srcy, int w, int h,
-			     int dstx, int dsty);
+                             int srcx, int srcy, int w, int h,
+                             int dstx, int dsty);
 extern RegionPtr dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-			      int srcx, int srcy, int width, int height,
-			      int dstx, int dsty, unsigned long bitPlane);
+                              int srcx, int srcy, int width, int height,
+                              int dstx, int dsty, unsigned long bitPlane);
 extern void dmxPolyPoint(DrawablePtr pDrawable, GCPtr pGC,
-			 int mode, int npt, DDXPointPtr pptInit);
+                         int mode, int npt, DDXPointPtr pptInit);
 extern void dmxPolylines(DrawablePtr pDrawable, GCPtr pGC,
-			 int mode, int npt, DDXPointPtr pptInit);
+                         int mode, int npt, DDXPointPtr pptInit);
 extern void dmxPolySegment(DrawablePtr pDrawable, GCPtr pGC,
-			   int nseg, xSegment *pSegs);
+                           int nseg, xSegment * pSegs);
 extern void dmxPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
-			     int nrects, xRectangle *pRects);
+                             int nrects, xRectangle *pRects);
 extern void dmxPolyArc(DrawablePtr pDrawable, GCPtr pGC,
-		       int narcs, xArc *parcs);
+                       int narcs, xArc * parcs);
 extern void dmxFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
-			   int shape, int mode, int count, DDXPointPtr pPts);
+                           int shape, int mode, int count, DDXPointPtr pPts);
 extern void dmxPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
-			    int nrectFill, xRectangle *prectInit);
+                            int nrectFill, xRectangle *prectInit);
 extern void dmxPolyFillArc(DrawablePtr pDrawable, GCPtr pGC,
-			   int narcs, xArc *parcs);
+                           int narcs, xArc * parcs);
 extern int dmxPolyText8(DrawablePtr pDrawable, GCPtr pGC,
-			int x, int y, int count, char *chars);
+                        int x, int y, int count, char *chars);
 extern int dmxPolyText16(DrawablePtr pDrawable, GCPtr pGC,
-			 int x, int y, int count, unsigned short *chars);
+                         int x, int y, int count, unsigned short *chars);
 extern void dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
-			  int x, int y, int count, char *chars);
+                          int x, int y, int count, char *chars);
 extern void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
-			   int x, int y, int count, unsigned short *chars);
+                           int x, int y, int count, unsigned short *chars);
 extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-			     int x, int y, unsigned int nglyph,
-			     CharInfoPtr *ppci, pointer pglyphBase);
+                             int x, int y, unsigned int nglyph,
+                             CharInfoPtr * ppci, pointer pglyphBase);
 extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-			    int x, int y, unsigned int nglyph,
-			    CharInfoPtr *ppci, pointer pglyphBase);
+                            int x, int y, unsigned int nglyph,
+                            CharInfoPtr * ppci, pointer pglyphBase);
 extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-			  int w, int h, int x, int y);
+                          int w, int h, int x, int y);
 
 extern void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
-			unsigned int format, unsigned long planeMask,
-			char *pdstLine);
+                        unsigned int format, unsigned long planeMask,
+                        char *pdstLine);
 extern void dmxGetSpans(DrawablePtr pDrawable, int wMax,
-			DDXPointPtr ppt, int *pwidth, int nspans,
-			char *pdstStart);
+                        DDXPointPtr ppt, int *pwidth, int nspans,
+                        char *pdstStart);
 
-#endif /* DMXGCOPS_H */
+#endif                          /* DMXGCOPS_H */