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 /hw/xnest/XNPixmap.h | |
parent | b8b1e933ccdecf68c12340e6b6ed34e5d37ed883 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
Diffstat (limited to 'hw/xnest/XNPixmap.h')
-rw-r--r-- | hw/xnest/XNPixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index 4e4d9c40c..fab1843d1 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H |