summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2018-03-05 08:57:40 +0000
committereadler <eadler@FreeBSD.org>2018-03-05 08:57:40 +0000
commit66576aafa7fb55efa6039ca94b7d28044e436ebb (patch)
treeea8852fe855b67b98d69373efa1af744d4faf5ca /share
parentb80c8bc911d3591f687f6237f8a9104fed74370c (diff)
downloadFreeBSD-src-66576aafa7fb55efa6039ca94b7d28044e436ebb.zip
FreeBSD-src-66576aafa7fb55efa6039ca94b7d28044e436ebb.tar.gz
MFC r322668,r324239,r324240,r324422,r324476,r324688:
FreeBSD 11.1 release added. ------------------------------------------------------------------------ r324239 | maxim | 2017-10-03 13:31:22 +0000 (Tue, 03 Oct 2017) | 2 lines FreeBSD 10.4 release added. ------------------------------------------------------------------------ r324240 | maxim | 2017-10-03 14:23:49 +0000 (Tue, 03 Oct 2017) | 5 lines o FreeBSD 10.4 happened after 11.1, adjust the branches accordingly. o The current FreeBSD branch is 12 not 13. Suggested by: lidl ------------------------------------------------------------------------ r324422 | eadler | 2017-10-09 04:43:05 +0000 (Mon, 09 Oct 2017) | 2 lines Add macOS 10.13 ------------------------------------------------------------------------ r324476 | eadler | 2017-10-10 05:47:10 +0000 (Tue, 10 Oct 2017) | 2 lines Add OpenBSD 6.2, reorder macOS 10.13 ------------------------------------------------------------------------ r324688 | maxim | 2017-10-17 14:37:12 +0000 (Tue, 17 Oct 2017) | 2 lines DragonFly 5.0.0 release added.
Diffstat (limited to 'share')
-rw-r--r--share/misc/bsd-family-tree29
1 files changed, 19 insertions, 10 deletions
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 9280b62..982e703 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -339,20 +339,24 @@ FreeBSD 5.2 | | | |
| | | | | DragonFly 4.2.0
| FreeBSD | | | |
| 10.2 | | | |
- | | OS X NetBSD 7.0 | |
+ | | macOS NetBSD 7.0 | |
| | 10.11 | OpenBSD 5.8 |
| | | | | DragonFly 4.4.1
| FreeBSD | | OpenBSD 5.9 |
| 10.3 | | | |
- | | NetBSD 7.0.1 | |
- | | | | DragonFly 4.6.0
- | | | | |
- | | | | |
- *--FreeBSD macOS | OpenBSD 6.0 |
- | 11.0 10.12 | | |
- | | NetBSD 7.1 | |
- | | | | DragonFly 4.8.0
- | | | OpenBSD 6.1 |
+ | | | NetBSD 7.0.1 | |
+ | `------. | | | DragonFly 4.6.0
+ | | | | | |
+ | | | | | |
+ *--FreeBSD | macOS | OpenBSD 6.0 |
+ | 11.0 | 10.12 | | |
+ | | | | NetBSD 7.1 | |
+ | | | macOS | | DragonFly 4.8.0
+ | | | 10.13 | OpenBSD 6.1 |
+ | FreeBSD | | | | |
+ | 11.1 FreeBSD | | | |
+ | | 10.4 | | OpenBSD 6.2 |
+ | v | | | DragonFly 5.0.0
| | | | |
FreeBSD 12 -current | NetBSD -current OpenBSD -current DragonFly -current
| | | | |
@@ -712,6 +716,11 @@ FreeBSD 11.0 2016-10-10 [FBD]
NetBSD 7.1 2017-03-11 [NBD]
DragonFly 4.8.0 2017-03-27 [DFB]
OpenBSD 6.1 2017-04-11 [OBD]
+FreeBSD 11.1 2017-07-26 [FBD]
+macOS 10.13 2017-09-25 [APL]
+FreeBSD 10.4 2017-10-03 [FBD]
+OpenBSD 6.2 2017-10-09 [OBD]
+DragonFly 5.0.0 2017-10-16 [DFB]
Bibliography
------------------------
OpenPOWER on IntegriCloud