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 /Xext/xvdix.h | |
parent | b8b1e933ccdecf68c12340e6b6ed34e5d37ed883 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
Diffstat (limited to 'Xext/xvdix.h')
-rw-r--r-- | Xext/xvdix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 8dafa8b26..d4bff69ad 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ #ifndef XVDIX_H #define XVDIX_H |