From 963dfed38835d8a75cfbed5d4f30769339134bde Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 18 May 2000 04:16:28 +0000 Subject: - Fix merge problems - Remove rcs keywords - Fix lib/GL install problem - Prepare for merge into trunk --- linux-core/drmP.h | 3 +-- linux/drm.h | 3 +-- linux/drmP.h | 3 +-- linux/proc.c | 3 +-- linux/vm.c | 3 +-- shared-core/drm.h | 3 +-- shared/drm.h | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 93baee13..43670e28 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1,8 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Thu Apr 13 10:32:41 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/drm.h b/linux/drm.h index 5b53df8c..25e4cce4 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -1,8 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Fri Apr 21 23:56:36 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/drmP.h b/linux/drmP.h index 93baee13..43670e28 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -1,8 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Thu Apr 13 10:32:41 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/proc.c b/linux/proc.c index 3b07eedf..392abceb 100644 --- a/linux/proc.c +++ b/linux/proc.c @@ -1,8 +1,7 @@ /* proc.c -- /proc support for DRM -*- linux-c -*- * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com - * Revised: Mon Apr 10 23:22:15 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/vm.c b/linux/vm.c index 6b9a8f3c..9c2cea56 100644 --- a/linux/vm.c +++ b/linux/vm.c @@ -1,8 +1,7 @@ /* vm.c -- Memory mapping for DRM -*- linux-c -*- * Created: Mon Jan 4 08:58:31 1999 by faith@precisioninsight.com - * Revised: Sat Apr 15 00:12:30 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/shared-core/drm.h b/shared-core/drm.h index 5b53df8c..25e4cce4 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -1,8 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Fri Apr 21 23:56:36 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/shared/drm.h b/shared/drm.h index 5b53df8c..25e4cce4 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -1,8 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Fri Apr 21 23:56:36 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a -- cgit v1.2.3