summaryrefslogtreecommitdiff
path: root/xgamma.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:27 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:27 +0000
commit11e04778ce8cc31fc03c8cc961b1c74f589c7c95 (patch)
tree62bde37673534e2a2159cceb752810092cd86ba5 /xgamma.c
parent83b8df8d51492e51eb148180306377c8b69d9dd6 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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 'xgamma.c')
-rw-r--r--xgamma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xgamma.c b/xgamma.c
index 177de62..ac210a0 100644
--- a/xgamma.c
+++ b/xgamma.c
@@ -21,7 +21,7 @@
*
* Written by David Bateman
*/
-/* $XFree86: xc/programs/xgamma/xgamma.c,v 1.4 1999/04/25 10:02:57 dawes Exp $ */
+/* $XFree86: xc/programs/xgamma/xgamma.c,v 1.3 1999/03/21 07:35:38 dawes Exp $ */
#include <stdio.h>
#include <errno.h>