Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 19:30:15 +00:00
parent f8e1ff3e00
commit 5d8038b297
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"

View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@ -149,7 +149,7 @@ static XF86ModuleVersionInfo dummyVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,