Module Name: src Committed By: christos Date: Mon Jan 7 15:43:05 UTC 2019
Modified Files: src/crypto/external/cpl/tpm-tools/dist/lib: Makefile.am Makefile.in src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt: Makefile.am Makefile.in src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt: tpm_nvcommon.c tpm_nvread.c Removed Files: src/crypto/external/cpl/tpm-tools/dist: configure.in src/crypto/external/cpl/tpm-tools/dist/po: stamp-po Log Message: merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/cpl/tpm-tools/dist/configure.in cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am \ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/cpl/tpm-tools/dist/po/stamp-po cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt/Makefile.am \ src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt/Makefile.in cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt/tpm_nvcommon.c \ src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt/tpm_nvread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.