Module Name: src Committed By: christos Date: Fri Sep 24 13:07:34 UTC 2021
Modified Files: src/external/bsd/libfido2/dist/tools: util.c src/external/bsd/libfido2/lib: Makefile Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/dist/tools/util.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libfido2/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.