Merge from head
authorbapt <bapt@FreeBSD.org>
Mon, 15 Jun 2015 10:56:01 +0000 (10:56 +0000)
committerbapt <bapt@FreeBSD.org>
Mon, 15 Jun 2015 10:56:01 +0000 (10:56 +0000)
commit35a6f0a11cfe0d26a30bdbedec91a5d1f245d073
tree38be19927629e894dac83d7490eda1567d530cb9
parent03d84058c3a2a1f69cd43d180104c0cee5dc3920
parent1f7642cc6f9e7a88f2e1524cbafc9b64fcff56f8
Merge from head
Makefile
Makefile.inc1
share/mk/bsd.files.mk
share/mk/bsd.incs.mk
share/mk/bsd.lib.mk
share/mk/bsd.man.mk
share/mk/bsd.prog.mk
share/mk/bsd.progs.mk
sys/conf/kern.post.mk
sys/conf/kmod.mk