Merge remote-tracking branch 'origin/released'

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

1 files changed, 8 insertions, 8 deletions

diff --git a/libXaw/include/X11/Xaw/TextP.h b/libXaw/include/X11/Xaw/TextP.h
index 2653500fb..60f462421 100644
--- a/libXaw/include/X11/Xaw/TextP.h
+++ b/libXaw/include/X11/Xaw/TextP.h
@@ -27,13 +27,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
@@ -104,10 +104,10 @@ typedef struct {
 typedef struct _XawTextSelectionSalt {
     struct _XawTextSelectionSalt *next;
     XawTextSelection	s;
-    /* 
+    /*
      * The element "contents" stores the CT string which is gotten in the
      * function _XawTextSaltAwaySelection()
-    */ 
+    */
     char		*contents;
     int			length;
 } XawTextSelectionSalt;
@@ -158,11 +158,11 @@ struct SearchAndReplace {
     Widget search_popup;	/* The poppup widget that allows searches.*/
     Widget label1;		/* The label widgets for the search window. */
     Widget label2;
-    Widget left_toggle; 	/* The left search toggle radioGroup. */
+    Widget left_toggle;		/* The left search toggle radioGroup. */
     Widget right_toggle;	/* The right search toggle radioGroup. */
     Widget rep_label;		/* The Replace label string. */
     Widget rep_text;		/* The Replace text field. */
-    Widget search_text; 	/* The Search text field. */
+    Widget search_text;		/* The Search text field. */
     Widget rep_one;		/* The Replace one button. */
     Widget rep_all;		/* The Replace all button. */
 #ifndef OLDXAW