diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:36 +0000 |
| commit | 9bc6e165c4c22f0eb412b306b7e0032a0f6dcac0 (patch) | |
| tree | 8741c8d6e5b158751e6f1e5b313e5ffdb6cb9b3c /oclock.c | |
| parent | b456377e090d94ffd38f64b7e0bf86f575b832c2 (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
Diffstat (limited to 'oclock.c')
| -rw-r--r-- | oclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/oclock/oclock.c,v 1.8 2003/05/27 22:26:57 tsi Exp $ */ +/* $XFree86: xc/programs/oclock/oclock.c,v 1.7tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xatom.h> |