diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
| commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
| tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /record | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'record')
| -rw-r--r-- | record/record.c | 3 | ||||
| -rw-r--r-- | record/set.c | 2 | ||||
| -rw-r--r-- | record/set.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/record/record.c b/record/record.c index 3657ef42b..e4d4dc5d8 100644 --- a/record/record.c +++ b/record/record.c @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -32,7 +33,7 @@ This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */ #define NEED_EVENTS #include "dixstruct.h" diff --git a/record/set.c b/record/set.c index 847a1b28d..341516664 100644 --- a/record/set.c +++ b/record/set.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */ /* diff --git a/record/set.h b/record/set.h index 169077720..6f0b872a1 100644 --- a/record/set.h +++ b/record/set.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86$ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension |