diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:30:15 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:30:15 +0000 |
commit | 5d8038b2977b7c0ab0ea17e263b3720cef83db59 (patch) | |
tree | e9dbcc7b0eb4e16f07feb9a2a6fbc077326efc5c | |
parent | f8e1ff3e00a773139aa1ab0ae72c83dc7792c175 (diff) |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r-- | src/dummy.h | 2 | ||||
-rw-r--r-- | src/dummy_driver.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dummy.h b/src/dummy.h index edffc4e..2727925 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -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" diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 224b9e2..2c2380a 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -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, |