CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - sys/nfsserver/nfs_fha_old.c

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - sys/nfsserver/nfs_fha_old.c

projects / FreeBSD / FreeBSD.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c4a81da e81032a)

author	Simon J. Gerraty <sjg@FreeBSD.org>
	Tue, 26 May 2015 21:52:57 +0000 (21:52 +0000)
committer	Simon J. Gerraty <sjg@FreeBSD.org>
	Tue, 26 May 2015 21:52:57 +0000 (21:52 +0000)
commit	b17ff922d4072ae132ece458f5b5d74a236880ac
tree	cbe2c5231a8355bd959e5b7054c2af5333fa7cf1	tree \| snapshot
parent	c4a81da0c86e429eb3e262498a8529ae341ecf1c	commit \| diff
parent	e81032ad243db32b8fd615b2d55ee94b9f6a5b6a	commit \| diff

Merge from head

share/mk/Makefile	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.compiler.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.dep.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.incs.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.lib.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.obj.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.opts.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.own.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.prog.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.subdir.mk	diff1 \|	diff2 \|	blob \| history
share/mk/bsd.sys.mk	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.