summaryrefslogtreecommitdiff
path: root/include/X11/Xtos.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
commite1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch)
treec501bcce6e36b6d99cc6e190e446c076efe85f02 /include/X11/Xtos.h
parent2928a163b235d91385874aa6a1a6f893b045f606 (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/X11/Xtos.h')
-rw-r--r--include/X11/Xtos.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index f87fdb2..efb08cf 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Xtos.h,v 3.12tsi Exp $ */
#ifndef _Xtos_h
#define _Xtos_h