svn commit: r251640 - head/share/misc
Eitan Adler
eadler at FreeBSD.org
Tue Jun 11 21:47:17 UTC 2013
Author: eadler
Date: Tue Jun 11 21:47:16 2013
New Revision: 251640
URL: http://svnweb.freebsd.org/changeset/base/251640
Log:
Merge latest NetBSD changes.
This adds some new NetBSD releases and makes some simple formatting changes.
With this commit NetBSD and FreeBSD should have identical files.
DragonflyFBSD has the version immediately prior to this commit.
When committing to this file please try to coordinate with all three groups.
Submitted by: Alan Barrett <apb at cequrux.com>
Modified:
head/share/misc/bsd-family-tree
Modified: head/share/misc/bsd-family-tree
==============================================================================
--- head/share/misc/bsd-family-tree Tue Jun 11 21:40:20 2013 (r251639)
+++ head/share/misc/bsd-family-tree Tue Jun 11 21:47:16 2013 (r251640)
@@ -221,51 +221,58 @@ FreeBSD 5.2 | |
*--FreeBSD | | | | | DragonFly 1.12.0
| 7.0 | | | | | |
| | | | | | OpenBSD 4.3 |
- | | | | | NetBSD 4.0.1 | DragonFly 2.0.0
- | | FreeBSD | | OpenBSD 4.4 |
+ | | | | | NetBSD | DragonFly 2.0.0
+ | | FreeBSD | | 4.0.1 OpenBSD 4.4 |
| | 6.4 | | | |
| | | | | |
| FreeBSD 7.1 | | | |
| | | | | DragonFly 2.2.0
| FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 |
- | \ | | | | |
- | | Mac OS X | | | |
- | | 10.6 | | | |
- | | | | | | DragonFly 2.4.0
- | | | | | OpenBSD 4.6 |
- | | | | | | |
- *--FreeBSD | | | | | |
- | 8.0 | | | | | |
- | | FreeBSD | | | | |
- | | 7.3 | | | | DragonFly 2.6.0
- | | | | | | OpenBSD 4.7 |
- | FreeBSD | | | | | |
- | 8.1 | | | | | |
- | | | | | | | DragonFly 2.8.2
- | | | | | | OpenBSD 4.8 |
- | | | | | NetBSD 5.1 | |
- | FreeBSD FreeBSD | | | | |
- | 8.2 7.4 | | | | DragonFly 2.10.1
- | | | | | OpenBSD 4.9 |
- | `-----. Mac OS X | | | |
- | \ 10.7 | | | |
- | | | | | OpenBSD 5.0 |
- *--FreeBSD | | | | | |
- | 9.0 | | | NetBSD 5.1.2 | DragonFly 3.0.1
- | | FreeBSD | | | |
- | | 8.3 | | OpenBSD 5.1 |
- | | | Mac OS X | | |
- | | | 10.8 | | |
- | | | | NetBSD 6.0 | |
- | | | | | OpenBSD 5.2 DragonFly 3.2.1
- | FreeBSD | | | | |
- | 9.1 | | | | |
- | | | | | |
- | | | | OpenBSD 5.3 DragonFly 3.4.1
- | | | NetBSD 6.1 | |
+ | \ | | | \ | |
+ | | Mac OS X | | \ | |
+ | | 10.6 | | \ | |
+ | | | | | NetBSD | DragonFly 2.4.0
+ | | | | | 5.0.1 OpenBSD 4.6 |
+ | | | | | | | |
+ *--FreeBSD | | | | | | |
+ | 8.0 | | | | | | |
+ | | FreeBSD | | | NetBSD | |
+ | | 7.3 | | | 5.0.2 | DragonFly 2.6.0
+ | | | | | | OpenBSD 4.7 |
+ | FreeBSD | | | | | |
+ | 8.1 | | | | | |
+ | | | | | | | DragonFly 2.8.2
+ | | | | | | OpenBSD 4.8 |
+ | | | | | *--NetBSD | |
+ | FreeBSD FreeBSD | | | 5.1 | |
+ | 8.2 7.4 | | | | | DragonFly 2.10.1
+ | | | | | | OpenBSD 4.9 |
+ | `-----. Mac OS X | | | | |
+ | \ 10.7 | | | | |
+ | | | | | | OpenBSD 5.0 |
+ *--FreeBSD | | | | | | |
+ | 9.0 | | | | NetBSD | DragonFly 3.0.1
+ | | FreeBSD | | | 5.1.2 | |
+ | | 8.3 | | | OpenBSD 5.1 |
+ | | | Mac OS X | `----. | |
+ | | | 10.8 | \ | |
+ | | | | NetBSD 6.0 | | |
+ | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1
+ | FreeBSD | | | | | NetBSD | |
+ | 9.1 | | | | | 5.2 | |
+ | | | | | \ | |
+ | | | | | NetBSD | |
+ | | | | | 6.0.1 | |
+ | | | | | | OpenBSD 5.3 DragonFly 3.4.1
+ | | | | | NetBSD | |
+ | | | | | 6.0.2 | |
+ | | | | | | |
+ | | | | `-NetBSD 6.1 | |
| FreeBSD | | | |
| 8.4 | | | |
| | | | |
+ | | | | |
+ | | | | |
FreeBSD 10 -current | NetBSD -current OpenBSD -current |
| | | | |
v v v v v
@@ -565,9 +572,12 @@ Mac OS X 10.8 2012-07-25 [APL]
NetBSD 6.0 2012-10-17 [NBD]
OpenBSD 5.2 2012-11-01 [OBD]
DragonFly 3.2.1 2012-11-02 [DFB]
+NetBSD 5.2 2012-12-03 [NBD]
+NetBSD 6.0.1 2012-12-26 [NBD] (security/critical release)
FreeBSD 9.1 2012-12-30 [FBD]
DragonFly 3.4.1 2013-04-29 [DFB]
OpenBSD 5.3 2013-05-01 [OBD]
+NetBSD 6.0.2 2013-05-18 [NBD] (security/critical release)
NetBSD 6.1 2013-05-18 [NBD]
FreeBSD 8.4 2013-06-07 [FBD]
More information about the svn-src-all
mailing list