Module Name: src Committed By: christos Date: Mon Jan 7 15:18:04 UTC 2019
Modified Files: src/crypto/external/cpl/trousers/bin/tcsd: Makefile src/crypto/external/cpl/trousers/dist/src/include: tcsd.h tcsps.h trousers_types.h src/crypto/external/cpl/trousers/dist/src/tcs/ps: ps_utils.c tcsps.c src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp: rpc.c src/crypto/external/cpl/trousers/dist/src/tcsd: platform.c svrside.c tcsd_conf.c tcsd_threads.c src/crypto/external/cpl/trousers/dist/src/tspi/ps: tspps.c Removed Files: src/crypto/external/cpl/trousers/dist: configure.in src/crypto/external/cpl/trousers/dist/man/man5: tcsd.conf.5 src/crypto/external/cpl/trousers/dist/man/man8: tcsd.8 src/crypto/external/cpl/trousers/dist/tools: Makefile.am Makefile.in ps_convert.c ps_inspect.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/cpl/trousers/bin/tcsd/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/cpl/trousers/dist/configure.in cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/cpl/trousers/dist/man/man5/tcsd.conf.5 cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/cpl/trousers/dist/man/man8/tcsd.8 cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/trousers/dist/src/include/tcsd.h \ src/crypto/external/cpl/trousers/dist/src/include/tcsps.h \ src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/trousers/dist/src/tcs/ps/ps_utils.c \ src/crypto/external/cpl/trousers/dist/src/tcs/ps/tcsps.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/trousers/dist/src/tcsd/platform.c \ src/crypto/external/cpl/trousers/dist/src/tcsd/svrside.c \ src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c \ src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_threads.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/trousers/dist/src/tspi/ps/tspps.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/cpl/trousers/dist/tools/Makefile.am \ src/crypto/external/cpl/trousers/dist/tools/Makefile.in \ src/crypto/external/cpl/trousers/dist/tools/ps_convert.c \ src/crypto/external/cpl/trousers/dist/tools/ps_inspect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.