diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:06 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:06 +0000 |
commit | da9e01ac6c7199ea2d7cac40af7587192c23aff2 (patch) | |
tree | 3f7e96b02b090aa1e61558469e4804237da0ec26 | |
parent | 7cc5582a833e643be56bc5154e86eea988d537a9 (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
-rw-r--r-- | xsetroot.c | 2 | ||||
-rw-r--r-- | xsetroot.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * Author: Mark Lillibridge, MIT Project Athena * 11-Jun-87 */ -/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.8 2001/12/14 20:02:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.7 2001/04/01 14:00:24 tsi Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/xsetroot.man b/xsetroot.man index a57eff6..1467869 100644 --- a/xsetroot.man +++ b/xsetroot.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.8 2001/12/14 20:02:23 dawes Exp $ +.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.7 2001/01/27 18:21:23 dawes Exp $ .\" .TH XSETROOT 1 __xorgversion__ .SH NAME |