[Xorg-commit] xc/programs/xclock xclock.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xclock
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xclock

Modified Files:
      Tag: XORG-CURRENT
	xclock.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xclock.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xclock/xclock.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xclock.c	17 Nov 2003 19:03:47 -0000	1.1.4.1
+++ b/xclock.c	23 Feb 2004 21:37:39 -0000	1.1.4.2
@@ -29,7 +29,7 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/programs/xclock/xclock.c,v 1.16 2002/10/21 13:33:08 alanh Exp $ */
+/* $XFree86: xc/programs/xclock/xclock.c,v 1.17 2003/12/29 09:10:37 herrb Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,13 +89,14 @@
 static void
 Syntax(char *call)
 {
-	(void) printf ("Usage: %s [-analog] [-bw <pixels>] [-digital] [-brief] [-utime] [-strftime <fmt-str>]\n", call);
+	(void) printf ("Usage: %s [-analog] [-bw <pixels>] [-digital] [-brief]\n", call);
+	(void) printf ("       [-utime] [-strftime <fmt-str>]\n");
 	(void) printf ("       [-fg <color>] [-bg <color>] [-hd <color>]\n");
 	(void) printf ("       [-hl <color>] [-bd <color>]\n");
 	(void) printf ("       [-fn <font_name>] [-help] [-padding <pixels>]\n");
 	(void) printf ("       [-rv] [-update <seconds>] [-display displayname]\n");
 #ifdef XRENDER
-	(void) printf ("       [-render] [-face <face name>] [-sharp]\n");
+	(void) printf ("       [-[no]render] [-face <face name>] [-sharp]\n");
 #endif
 	(void) printf ("       [-geometry geom] [-twelve] [-twentyfour]\n\n");
 	exit(1);