18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

3 files changed, 3 insertions, 3 deletions

diff --git a/man/sunbw2.man b/man/sunbw2.man
index ac05ccf..8a50cd5 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2 2001/01/27 18:20:53 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1 2001/01/24 00:06:28 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SUNBW2 __drivermansuffix__ __vendorversion__
diff --git a/src/bw2.h b/src/bw2.h
index a1284c8..6277f05 100644
--- a/src/bw2.h
+++ b/src/bw2.h
@@ -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/sunbw2/bw2.h,v 1.1 2000/06/30 17:15:13 dawes Exp $ */
+/* $XFree86:$ */
 
 #ifndef BW2_H
 #define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 5888b0e..00dc62b 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4 2003/10/30 17:37:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"