diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:35 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:35 +0000 |
| commit | 8ba8fced39f55e9a7b25956d096a7ac327257971 (patch) | |
| tree | bbca2f7b676d56aec2bf968ba163924e848a0df4 | |
| parent | a2500e2fc16728938d0904669af56528e4e895f5 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
| -rw-r--r-- | man/suncg14.man | 2 | ||||
| -rw-r--r-- | src/cg14.h | 2 | ||||
| -rw-r--r-- | src/cg14_driver.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/suncg14.man b/man/suncg14.man index fa14e1c..f333658 100644 --- a/man/suncg14.man +++ b/man/suncg14.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.man,v 1.2 2001/01/27 18:20:53 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG14 __drivermansuffix__ __vendorversion__ @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h,v 1.2 2001/03/03 22:41:33 tsi Exp $ */ #ifndef CG14_H #define CG14_H diff --git a/src/cg14_driver.c b/src/cg14_driver.c index 5f95013..9a07d8f 100644 --- a/src/cg14_driver.c +++ b/src/cg14_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c,v 1.7 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c,v 1.6 2001/10/01 13:44:10 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" |