diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:08 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:08 +0000 |
| commit | 4e92ef88124207e46e99d3215de66bd82372ce8e (patch) | |
| tree | c5781217c007a3cc463d5faf3aa347ce47b4bfc7 /dbe | |
| parent | b8b1e933ccdecf68c12340e6b6ed34e5d37ed883 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
Diffstat (limited to 'dbe')
| -rw-r--r-- | dbe/dbe.c | 3 | ||||
| -rw-r--r-- | dbe/dbestruct.h | 2 | ||||
| -rw-r--r-- | dbe/midbe.c | 2 | ||||
| -rw-r--r-- | dbe/midbe.h | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.3.2.2 2004/03/04 17:47:26 eich Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * @@ -30,7 +31,7 @@ * DIX DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.10 2001/08/23 14:19:24 alanh Exp $ */ /* INCLUDES */ diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 3634fe7d7..f176c6fd1 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -30,7 +30,7 @@ * Header file for DIX-related DBE * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index e7617e728..bdf46b8ae 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -30,7 +30,7 @@ * Machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.4 2001/03/06 17:31:34 dawes Exp $ */ /* INCLUDES */ diff --git a/dbe/midbe.h b/dbe/midbe.h index 7b1237633..3f9bb0090 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -30,7 +30,7 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef MIDBE_H |