diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
commit | 0664db19bf37f9dd69cca6adff4e238e310c3092 (patch) | |
tree | d2cc9d3132d40796018a853df38877fa5b027f18 /XTrap/xtrapdi.c | |
parent | 9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'XTrap/xtrapdi.c')
-rw-r--r-- | XTrap/xtrapdi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index d09b2120a..efc9bf1d2 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */ +/* $XdotOrg$ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH. |