diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
| commit | e0e8074ee732ae4c73ae6597df4f5b1682fdee78 (patch) | |
| tree | 8741c8d6e5b158751e6f1e5b313e5ffdb6cb9b3c /Clock.h | |
| parent | b639d6833dfa87bd8bd561862a74992d90e2f253 (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-CURRENTXACE-SELINUXDAMAGE-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.h')
| -rw-r--r-- | Clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/Clock.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/Clock.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */ #ifndef _XtClock_h #define _XtClock_h |