-
Shawn Webb authored
Conflicts: share/man/man5/src.conf.5 (unresolved) share/mk/bsd.lib.mk (unresolved) share/mk/bsd.prog.mk (unresolved)
9a648b98
Conflicts: share/man/man5/src.conf.5 (unresolved) share/mk/bsd.lib.mk (unresolved) share/mk/bsd.prog.mk (unresolved)