Merge remote-tracking branch 'origin/released'

Conflicts:
	freetype/src/raster/ftraster.c
	openssl/Makefile

1 files changed, 9 insertions, 9 deletions

diff --git a/libXaw/include/X11/Xaw/MultiSrcP.h b/libXaw/include/X11/Xaw/MultiSrcP.h
index a3609ccd0..95642a43b 100644
--- a/libXaw/include/X11/Xaw/MultiSrcP.h
+++ b/libXaw/include/X11/Xaw/MultiSrcP.h
@@ -52,13 +52,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -80,11 +80,11 @@ SOFTWARE.
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
-/* 
+/*
  * This file was changed from AsciiSrcP.h.
  *
  * By Li Yuhong, Sept. 18, 1990
@@ -107,10 +107,10 @@ SOFTWARE.
 #endif
 #endif
 
-typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated 
+typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated
 				   characters */
     wchar_t* text;		/* The text in this buffer */
-    XawTextPosition used;	/* The number of characters of this buffer 
+    XawTextPosition used;	/* The number of characters of this buffer
 				   that have been used */
     struct _MultiPiece *prev, *next;	/* linked list pointers */
 } MultiPiece;
@@ -153,7 +153,7 @@ typedef struct _MultiSrcPart {
 #endif
     Boolean allocated_string;	/* Have I allocated the
 				   string in multi_src->string? */
-    XawTextPosition length; 	/* length of file - IN CHARACTERS, NOT BYTES */
+    XawTextPosition length;	/* length of file - IN CHARACTERS, NOT BYTES */
     MultiPiece *first_piece;	/* first piece of the text */
 #ifndef OLDXAW
     XtPointer pad[4];	/* for future use and keep binary compatability */