Merge commit '00f1a4f432b3d8aad1aa270e91c44c57f03ef407'
commit07ce9f11e2fc485485490445f5cafba9dcf0e0df
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 22 Aug 2018 21:08:08 +0000 (22 17:08 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 22 Aug 2018 22:22:17 +0000 (22 18:22 -0400)
tree9c4b703792e7dc71d9c9eda599078c5309bd3363
parent66bc2470884efd5058ade608a98adf0466ce5045
parent00f1a4f432b3d8aad1aa270e91c44c57f03ef407
Merge commit '00f1a4f432b3d8aad1aa270e91c44c57f03ef407'
usr/src/cmd/make/include/mk/defs.h
usr/src/lib/libc/port/inet/ruserpass.c