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/src/AsciiText.c b/libXaw/src/AsciiText.c
index 25cea9d18..8e2f0aa66 100644
--- a/libXaw/src/AsciiText.c
+++ b/libXaw/src/AsciiText.c
@@ -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
@@ -48,13 +48,13 @@ SOFTWARE.
 /*
  * AsciiText.c - Source code for AsciiText Widget
  *
- * This Widget is intended to be used as a simple front end to the 
+ * This Widget is intended to be used as a simple front end to the
  * text widget with an ascii source and ascii sink attached to it
  *
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -314,7 +314,7 @@ XawAsciiInitialize(Widget request, Widget cnew,
 
     for (i = 0, tab = 0; i < TAB_COUNT; i++)
 	tabs[i] = (tab += 8);
-  
+
     XawTextSinkSetTabs(w->text.sink, TAB_COUNT, tabs);
 
     XawTextDisableRedisplay(cnew);
@@ -336,7 +336,7 @@ XawAsciiInitialize(Widget request, Widget cnew,
     }
 }
 
-static void 
+static void
 XawAsciiDestroy(Widget w)
 {
     AsciiWidget ascii = (AsciiWidget)w;