CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit

projects / FreeBSD / stable / 9.git / commit

author	ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
	Sun, 15 Nov 2015 21:41:51 +0000 (21:41 +0000)
committer	ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
	Sun, 15 Nov 2015 21:41:51 +0000 (21:41 +0000)
commit	7d1020857a0fb7a2d8c6208303d92fb0a66fb0b5
tree	38a5c39040b954cff9ae6eb90975c5962e318ba7	tree \| snapshot
parent	378f1feeb7329e90090d1e03e29dd67648085890	commit \| diff

MFstable/10 r249373:

r249373 (by joel):

Remove contractions.

Command used:
$ svn merge --accept mine-full -c r249373 ^/stable/10

Conflicts:
share/man/man9/locking.9
share/man/man9/zone.9
usr.bin/patch

git-svn-id: svn://svn.freebsd.org/base/stable/9@290888 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

9-STABLE

RSS Atom

sbin/camcontrol/camcontrol.8		diff \| blob \| history
sbin/kldload/kldload.8		diff \| blob \| history
sbin/newfs/newfs.8		diff \| blob \| history
share/man/man3/fpgetround.3		diff \| blob \| history
share/man/man4/ng_tag.4		diff \| blob \| history
share/man/man4/sdhci.4		diff \| blob \| history
usr.sbin/bluetooth/l2ping/l2ping.8		diff \| blob \| history
usr.sbin/ctladm/ctladm.8		diff \| blob \| history
usr.sbin/makefs/makefs.8		diff \| blob \| history
usr.sbin/mptutil/mptutil.8		diff \| blob \| history
usr.sbin/services_mkdb/services_mkdb.8		diff \| blob \| history