===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/29.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- www/29.html 2001/04/30 21:59:35 1.14
+++ www/29.html 2001/05/01 11:15:24 1.15
@@ -98,18 +98,10 @@
The system includes the following major components from outside suppliers:
-<<<<<<< 29.html
-- XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support
-for all chipsets)
-
- gcc 2.95.3 (+ patches)
-
- perl 5.6.0 plus a few fixes.
-
- Apache 1.3.19 (+ patches), mod_ssl 2.8.1, OpenSSL 0.9.5a, DSO support
-=======
- XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support for all chipsets)
- gcc 2.95.3 (+ patches)
- perl 5.6.0 (+ patches)
- Apache 1.3.19, mod_ssl 2.8.2, OpenSSL 0.9.6 (+ patches), DSO support
->>>>>>> 1.13
- ipf 3.4.16 (+ patches)
- groff 1.15
- sendmail 8.11.3
@@ -387,7 +379,7 @@
www@openbsd.org
-
$OpenBSD: 29.html,v 1.14 2001/04/30 21:59:35 espie Exp $
+
$OpenBSD: 29.html,v 1.15 2001/05/01 11:15:24 espie Exp $