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, 6 insertions, 11 deletions

diff --git a/xorg-server/include/selection.h b/xorg-server/include/selection.h
index 3271f6abb..37e4f5e64 100644
--- a/xorg-server/include/selection.h
+++ b/xorg-server/include/selection.h
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -65,13 +64,12 @@ typedef struct _Selection {
     PrivateRec *devPrivates;
 } Selection;
 
-
 /*
  *  Selection API
  */
 
-extern _X_EXPORT int dixLookupSelection(Selection **result, Atom name,
-		       ClientPtr client, Mask access_mode);
+extern _X_EXPORT int dixLookupSelection(Selection ** result, Atom name,
+                                        ClientPtr client, Mask access_mode);
 
 extern _X_EXPORT Selection *CurrentSelections;
 
@@ -84,12 +82,11 @@ typedef enum {
 } SelectionCallbackKind;
 
 typedef struct {
-    struct _Selection	    *selection;
-    ClientPtr		    client;
-    SelectionCallbackKind   kind;
+    struct _Selection *selection;
+    ClientPtr client;
+    SelectionCallbackKind kind;
 } SelectionInfoRec;
 
-
 /*
  *  Selection server internals
  */
@@ -100,6 +97,4 @@ extern _X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin);
 
 extern _X_EXPORT void DeleteClientFromAnySelections(ClientPtr client);
 
-#endif /* SELECTION_H */
-
-
+#endif                          /* SELECTION_H */