summaryrefslogtreecommitdiff
path: root/src/lg.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:22 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:22 +0000
commit7bf8e9d736765001111e3245da36817a5a42dd12 (patch)
tree73d7246c3c4118bab88f4110fb570e0202eaf82d /src/lg.h
parent14f3d1571c6ce463da1b349192a2981d0e1188fa (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 'src/lg.h')
-rw-r--r--src/lg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lg.h b/src/lg.h
index 9d91053..09285a4 100644
--- a/src/lg.h
+++ b/src/lg.h
@@ -10,7 +10,7 @@
* Inspired by cir.h
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.11 2000/12/06 15:35:16 eich Exp $ */
#ifndef LG_H
#define LG_H