Module Name: src Committed By: pgoyette Date: Mon Jun 25 10:11:21 UTC 2018
Modified Files: src/sys/sys [pgoyette-compat]: module.h Log Message: Resolve conflict correctly! To generate a diff of this commit: cvs rdiff -u -r1.41.14.9 -r1.41.14.10 src/sys/sys/module.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.