Merge remote-tracking branch 'origin/released'

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

1 files changed, 5 insertions, 5 deletions

diff --git a/libXaw/src/MultiSink.c b/libXaw/src/MultiSink.c
index 129624e01..77eb42fd9 100644
--- a/libXaw/src/MultiSink.c
+++ b/libXaw/src/MultiSink.c
@@ -51,13 +51,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
@@ -662,7 +662,7 @@ GetGC(MultiSinkObject sink)
     values.clip_x_origin = (long)sink;
     values.clip_mask = None;
     values.graphics_exposures = False;
-    
+
     values.foreground = sink->text_sink.foreground;
     values.background = sink->text_sink.background;