summaryrefslogtreecommitdiff
path: root/src/XRes.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
commit50fd91205709092a640e3b35b3062ffb279941f1 (patch)
treec481a7d333eca5e4b2a86a6e4b6019be3b2a1198 /src/XRes.c
parent1f27e1259a6dd2237b3dfe752ac138d83c5e5409 (diff)
downloadxorg-lib-libXRes-DAMAGE-XFIXES.tar.gz
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 'src/XRes.c')
-rw-r--r--src/XRes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XRes.c b/src/XRes.c
index 3e9bf24..474d2df 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -1,7 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/lib/XRes/XRes.c,v 1.4 2002/10/16 00:37:26 dawes Exp $ */
+/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES