summaryrefslogtreecommitdiff
path: root/src/lex.l
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
commite8a005881cad65292bd73a2ed8f7454ce9d461f0 (patch)
tree4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/lex.l
parent9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (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/lex.l')
-rw-r--r--src/lex.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lex.l b/src/lex.l
index 93f3bd7..6f0f627 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
* 12-Nov-87 Thomas E. LaStrange File created
*
***********************************************************************/
-/* $XFree86: xc/programs/twm/lex.l,v 3.14 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/lex.l,v 3.13 2001/08/27 21:11:39 dawes Exp $ */
/* #include <stdio.h> */ /* lex already includes stdio.h */
#include "twm.h"