diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
commit | 80f0b1e726e3fa5f2077109c662e8c6d3204e344 (patch) | |
tree | 97c95d56deef6418f3cb06a41e4970d06f86e92f /panoramiXproto.h | |
parent | d26f4e0e82dd3946d7148ec33e3d7d657cbbb61b (diff) | |
download | xorg-proto-xineramaproto-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 'panoramiXproto.h')
-rw-r--r-- | panoramiXproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/panoramiXproto.h b/panoramiXproto.h index fe3826e..6b27c56 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ |