diff options
| author | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
| commit | 7fcd33c1faf567506b5c0b4148c7a15a10788a5d (patch) | |
| tree | 2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /share/misc | |
| parent | 2a59274eda20cc626e28052fff7aa8b7bf6a3683 (diff) | |
| parent | 5cca672bb0892f1c5da630c34a1f98e2de4d7064 (diff) | |
| download | FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.zip FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.tar.gz | |
Merge head@256284
Diffstat (limited to 'share/misc')
| -rw-r--r-- | share/misc/bsd-family-tree | 42 | ||||
| -rw-r--r-- | share/misc/committers-ports.dot | 5 | ||||
| -rw-r--r-- | share/misc/committers-src.dot | 1 |
3 files changed, 36 insertions, 12 deletions
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index f32f136..74a9287 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -253,23 +253,37 @@ FreeBSD 5.2 | | | | *--FreeBSD | | | | | | | | 9.0 | | | | NetBSD | DragonFly 3.0.1 | | FreeBSD | | | 5.1.2 | | - | | 8.3 | | | OpenBSD 5.1 | + | | 8.3 | | | | | | + | | | | | | NetBSD | | + | | | | | | 5.1.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 | | | | + | | | | | | | | | | + | | | | | | | NetBSD | | + | | | | | | | 5.2.1 | | + | | | | | | | | | + | | | | | | \ | | + | | | | | | NetBSD | | + | | | | | | 6.0.1 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.2 | | + | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 + | | | | | | NetBSD | | + | | | | | | 6.0.2 | | + | | | | | | | | + | | | | | |`-NetBSD 6.1 | | + | | FreeBSD | | | | | + | | 8.4 | | NetBSD 6.1.1 | | + | | | | | | | + | FreeBSD | | NetBSD 6.1.2 | | + | 9.2 | | | | + | | | | | | | | | | | | | | | | | | | | @@ -580,6 +594,12 @@ 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] +NetBSD 6.1.1 2013-08-22 [NBD] +NetBSD 5.1.3 2013-09-29 [NBD] +NetBSD 5.2.1 2013-09-29 [NBD] +FreeBSD 9.2 2013-09-30 [FBD] +NetBSD 6.0.3 2013-09-30 [NBD] +NetBSD 6.1.2 2013-09-30 [NBD] Bibliography ------------------------ diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 79831dc..c727cd7 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -77,6 +77,7 @@ cs [label="Carlo Strub\ncs@FreeBSD.org\n2011/09/13"] culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"] daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] +danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"] db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"] decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] @@ -278,9 +279,10 @@ crees -> madpilot crees -> gblach crees -> tijl +culot -> danilo culot -> jase -culot -> wg culot -> marino +culot -> wg db -> tj @@ -532,6 +534,7 @@ wen -> cs wen -> culot wen -> pawel +wg -> danilo wg -> nemysis will -> lioux diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index a273cf9..b9729cc 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -145,6 +145,7 @@ dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2004/11/29"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/01/18"] ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"] +edavis [label="Eric Davis\nedavis@FreeBSD.org\n2013/10/09"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] eivind [label="Eivind Eklund\neivind@FreeBSD.org\n1997/02/02"] emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"] |
