summaryrefslogtreecommitdiff
path: root/include/dixfont.h
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:08 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:08 +0000
commit4e92ef88124207e46e99d3215de66bd82372ce8e (patch)
treec5781217c007a3cc463d5faf3aa347ce47b4bfc7 /include/dixfont.h
parentb8b1e933ccdecf68c12340e6b6ed34e5d37ed883 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
Diffstat (limited to 'include/dixfont.h')
-rw-r--r--include/dixfont.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dixfont.h b/include/dixfont.h
index 2a6877de2..d3bb69b0a 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
#ifndef DIXFONT_H
#define DIXFONT_H 1