diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
| commit | 1c42f5214277f467361a63bdb29a0c0bed3517b8 (patch) | |
| tree | 267360093b4f702aa1d2d07f47493e3353fb48e5 /Clock.c | |
| parent | 7a5582d9ab45c1ef92a70119322c09da8759d334 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'Clock.c')
| -rw-r--r-- | Clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.c,v 3.26 2003/10/25 00:52:37 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */ #include <X11/Xlib.h> #include <X11/StringDefs.h> |