svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 5 insertions, 5 deletions

diff --git a/libX11/src/Quarks.c b/libX11/src/Quarks.c
index 208739661..64c12f2c6 100644
--- a/libX11/src/Quarks.c
+++ b/libX11/src/Quarks.c
@@ -5,13 +5,13 @@ Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
 
                         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 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
@@ -359,7 +359,7 @@ XrmStringToQuark(
 
     if (!name)
 	return (NULLQUARK);
-    
+
     for (tname = (char *)name; (c = *tname++); )
 	sig = (sig << 1) + c;