summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authormaxim <maxim@FreeBSD.org>2005-11-03 07:59:58 +0000
committermaxim <maxim@FreeBSD.org>2005-11-03 07:59:58 +0000
commit530fe296e17005f0956f0db726aff67431156516 (patch)
treea244304c4c2f6c25d46a0423bebe2f723bb4b7bc /share
parentf044c165569b80157e1d65a9dd47d8c08aad6202 (diff)
downloadFreeBSD-src-530fe296e17005f0956f0db726aff67431156516.zip
FreeBSD-src-530fe296e17005f0956f0db726aff67431156516.tar.gz
Merge from RELENG_6: FreeBSD 6.0. Not sure the release date is correct
because no release announce yet.
Diffstat (limited to 'share')
-rw-r--r--share/misc/bsd-family-tree8
1 files changed, 6 insertions, 2 deletions
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 451649f..ac1215a 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -190,9 +190,12 @@ FreeBSD 5.2 | | | |
| FreeBSD 5.4 10.4 | | | |
| | | | | OpenBSD 3.7 |
| V | | v | |
- | | | OpenBSD 3.8 |
| | | | |
-FreeBSD 6 -current | NetBSD -current OpenBSD -current |
+ *---FreeBSD 6.0 | | OpenBSD 3.8 |
+ | | | | | |
+ | V | | | |
+ | | | | |
+FreeBSD 7 -current | NetBSD -current OpenBSD -current |
| | | | |
v v v v v
@@ -428,6 +431,7 @@ Mac OS X 10.4 2005-04-29 [APL]
FreeBSD 5.4 2005-05-09 [FBD]
OpenBSD 3.7 2005-05-19 [OBD]
OpenBSD 3.8 2005-11-01 [OBD]
+FreeBSD 6.0 2005-11-01 [FBD]
Bibliography
------------------------
OpenPOWER on IntegriCloud