summaryrefslogtreecommitdiff
path: root/os/waitfor.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:48 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:48 +0000
commit956b25ecaa203291b5abdfc43451ae34da4ebdc7 (patch)
tree9677da566d4ee10e981676bd628fe448c5c5af70 /os/waitfor.c
parent54409026c1afcd67c2d548a9efc606e29d47715f (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'os/waitfor.c')
-rw-r--r--os/waitfor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/waitfor.c b/os/waitfor.c
index 8394e78..09e30c8 100644
--- a/os/waitfor.c
+++ b/os/waitfor.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
* $NCDXorg: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $
*
*/
-/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.16 2002/05/31 18:46:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.15 2001/12/14 20:01:41 dawes Exp $ */
#include <X11/Xos.h> /* strings, time, etc */