diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
commit | 738e462ac1c406d81bd39ec4c43f27b97d3424ad (patch) | |
tree | 49526008cc2e951f07c5cf2c755ecf0c5771a138 /b4light.c | |
parent | a9ea794c9432eb5abb7d222e032f9cec0870f89a (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 'b4light.c')
-rw-r--r-- | b4light.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/beforelight/b4light.c,v 3.7 2003/10/24 20:38:10 tsi Exp $ */ +/* $XFree86: xc/programs/beforelight/b4light.c,v 3.6tsi Exp $ */ #include <X11/Xatom.h> #include <X11/Intrinsic.h> |