Merge remote-tracking branch 'origin/released'

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

1 files changed, 13 insertions, 13 deletions

diff --git a/libXaw/include/X11/Xaw/List.h b/libXaw/include/X11/Xaw/List.h
index e00569c20..7fc59f4fe 100644
--- a/libXaw/include/X11/Xaw/List.h
+++ b/libXaw/include/X11/Xaw/List.h
@@ -23,11 +23,11 @@ in this Software without prior written authorization from The Open Group.
 */
 
 /*  This is the List widget, it is useful to display a list, without the
- *  overhead of having a widget for each item in the list.  It allows 
+ *  overhead of having a widget for each item in the list.  It allows
  *  the user to select an item in a list and notifies the application through
  *  a callback function.
  *
- *	Created: 	8/13/88
+ *	Created:	8/13/88
  *	By:		Chris D. Peterson
  *                      MIT X Consortium
  */
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
  cursor		     Cursor		Cursor		left_ptr
  cursorName	     Cursor		String		NULL
  defaultColumns      Columns            int             2          **5
- destroyCallback     Callback		Pointer		NULL 
+ destroyCallback     Callback		Pointer		NULL
  font		     Font		XFontStruct*	XtDefaultFont
  forceColumns        Columns            Boolean         False      **5
  foreground	     Foreground		Pixel		XtDefaultForeground
@@ -75,28 +75,28 @@ in this Software without prior written authorization from The Open Group.
        is set to the minimum size necessay to fit the entire list.
 
        If both Width and Height are zero then they are adjusted to fit the
-       entire list that is created width the number of default columns 
+       entire list that is created width the number of default columns
        specified in the defaultColumns resource.
 
  **2 - This is an array of strings the specify elements of the list.
-       This resource must be specified. 
+       This resource must be specified.
        (What good is a list widget without a list??  :-)
 
  **3 - Longest is the length of the widest string in pixels.
 
  **4 - If either of these values are zero (0) then the list widget calculates
-       the correct value. 
+       the correct value.
 
-       (This allows you to make startup faster if you already have 
+       (This allows you to make startup faster if you already have
         this information calculated)
 
-       NOTE: If the numberStrings value is zero the list must 
+       NOTE: If the numberStrings value is zero the list must
              be NULL terminated.
 
  **5 - By setting the List.Columns resource you can force the application to
-       have a given number of columns.	     
-        
- **6 - This returns the name and index of the item selected in an 
+       have a given number of columns.
+
+ **6 - This returns the name and index of the item selected in an
        XawListReturnStruct that is pointed to by the client_data
        in the CallbackProc.
 
@@ -105,7 +105,7 @@ in this Software without prior written authorization from The Open Group.
 /*
  * Value returned when there are no highlighted objects
  */
-#define XAW_LIST_NONE -1	
+#define XAW_LIST_NONE -1
 
 #define XtCList "List"
 #define XtCSpacing "Spacing"
@@ -124,7 +124,7 @@ in this Software without prior written authorization from The Open Group.
 #define XtNrowSpacing "rowSpacing"
 #define XtNverticalList "verticalList"
 #define XtNshowCurrent "showCurrent"
- 
+
 #ifndef XtNfontSet
 #define XtNfontSet "fontSet"
 #endif