Merge remote-tracking branch 'origin/released'

* origin/released:
  Switched to xcalc-1.0.5
  Switched to bdftopcf-1.0.4
  libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config

1 files changed, 8 insertions, 8 deletions

diff --git a/apps/xcalc/xcalc.c b/apps/xcalc/xcalc.c
index d51034156..68a69ec4e 100644
--- a/apps/xcalc/xcalc.c
+++ b/apps/xcalc/xcalc.c
@@ -68,7 +68,7 @@ char	dispstr[LCD_STR_LEN];		/* string to show up in the LCD */
 Atom	wm_delete_window;		/* see ICCCM section 5.2.2 */
 
 /*
- *	local data 
+ *	local data
  */
 static Display	*dpy = NULL;		/* connection to the X server */
 static Widget	toplevel=NULL;  	/* top level shell widget */
@@ -122,7 +122,7 @@ main(int argc, char **argv)
     toplevel = XtAppInitialize(&xtcontext, "XCalc", Options, XtNumber(Options),
 			       &argc, argv, NULL, NULL, 0);
     if (argc != 1) Syntax(argc, argv);
-    
+
     XtSetArg(args[0], XtNinput, True);
     XtSetValues(toplevel, args, ONE);
 
@@ -133,7 +133,7 @@ main(int argc, char **argv)
 
     XtAppAddActions(xtcontext, Actions, ActionsCount);
 
-    XtOverrideTranslations(toplevel, 
+    XtOverrideTranslations(toplevel,
 	   XtParseTranslationTable("<Message>WM_PROTOCOLS: quit()\n"));
 
     XtRealizeWidget(toplevel);
@@ -205,7 +205,7 @@ static void create_display(Widget parent)
 				XtNumber(args));
 
     /* INV - the inverse function indicator */
-    ind[XCalc_INVERSE] = XtCreateManagedWidget("INV", labelWidgetClass, 
+    ind[XCalc_INVERSE] = XtCreateManagedWidget("INV", labelWidgetClass,
 					 screen, args, XtNumber(args));
 
     /* DEG - the degrees switch indicator */
@@ -227,8 +227,8 @@ static void create_display(Widget parent)
 
 /*
  *	Do all the buttons.  The application defaults file will give the
- *	default button placement, default button labels, and default 
- *      actions connected to the buttons.  The user can change any of 
+ *	default button placement, default button labels, and default
+ *      actions connected to the buttons.  The user can change any of
  *      these defaults in an environment-specific resource file.
  */
 
@@ -294,7 +294,7 @@ void Quit(void)
     exit(0);
 }
 
-/*  
+/*
  *	recite and die.
  */
 static void Syntax(int argc, char **argv)
@@ -313,7 +313,7 @@ static void Syntax(int argc, char **argv)
     exit(1);
 }
 
-/*    
+/*
  * I use actions on the toggle widget to support selections.  This
  * means that the user may not do a partial selection of the number
  * displayed in the `liquid crystal display.'  Copying numbers into