summaryrefslogtreecommitdiff
path: root/include/misc.h
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
commit064520002b727dbbaae1f0ec25fa73c40b3362d3 (patch)
treee8050e0d93e44dd014db4fe8d05ca27c1647fc80 /include/misc.h
parent7e40c0280141045540a73dbb76f63b6be81db73c (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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 'include/misc.h')
-rw-r--r--include/misc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/misc.h b/include/misc.h
index a6de816..43d8733 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/xfs/include/misc.h,v 3.9 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/misc.h,v 3.8 2001/07/25 15:05:21 dawes Exp $ */
#ifndef _MISC_H_
#define _MISC_H_