Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 18:43:06 +00:00
parent 186ca3a9e3
commit 495c71ddaa
2 changed files with 2 additions and 2 deletions

View file

@ -1,4 +1,4 @@
/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */
/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc

View file

@ -1,4 +1,4 @@
/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */
/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc