Module Name:	src
Committed By:	christos
Date:		Mon Nov 13 21:55:37 UTC 2006

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ
	src/crypto/dist/openssl/apps: enc.c openssl.c progs.h smime.c speed.c
	src/crypto/dist/openssl/crypto: opensslconf.h opensslv.h
	src/crypto/dist/openssl/crypto/aes: aes.h
	src/crypto/dist/openssl/crypto/asn1: tasn_dec.c
	src/crypto/dist/openssl/crypto/dh: dh.h dh_err.c dh_key.c
	src/crypto/dist/openssl/crypto/dsa: dsa.h dsa_err.c
	src/crypto/dist/openssl/crypto/ec: ec.h
	src/crypto/dist/openssl/crypto/err: err.c
	src/crypto/dist/openssl/crypto/evp: c_allc.c evp.h
	src/crypto/dist/openssl/crypto/pkcs7: pk7_smime.c
	src/crypto/dist/openssl/crypto/rsa: rsa.h rsa_eay.c rsa_err.c
	    rsa_sign.c
	src/crypto/dist/openssl/doc/apps: ciphers.pod smime.pod
	src/crypto/dist/openssl/ms: mingw32.bat
	src/crypto/dist/openssl/ssl: s2_clnt.c s2_lib.c s3_lib.c ssl.h
	    ssl_cert.c ssl_ciph.c ssl_locl.h
	src/crypto/dist/openssl/util: mkdef.pl

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -r1.13 -r1.14 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.14 -r1.15 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/apps/enc.c \
    src/crypto/dist/openssl/apps/speed.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/apps/openssl.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/apps/progs.h
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/apps/smime.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/opensslconf.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/opensslv.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/aes/aes.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/asn1/tasn_dec.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/dh/dh.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/dh/dh_err.c \
    src/crypto/dist/openssl/crypto/dh/dh_key.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/dsa/dsa.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/dsa/dsa_err.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/ec/ec.h
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/crypto/err/err.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/evp/c_allc.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/crypto/evp/evp.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/pkcs7/pk7_smime.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/crypto/rsa/rsa.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/rsa/rsa_eay.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/rsa/rsa_err.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/apps/ciphers.pod
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/doc/apps/smime.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/ms/mingw32.bat
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/ssl/s2_clnt.c \
    src/crypto/dist/openssl/ssl/s2_lib.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/ssl/s3_lib.c \
    src/crypto/dist/openssl/ssl/ssl_locl.h
cvs rdiff -r1.14 -r1.15 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/ssl/ssl_cert.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/util/mkdef.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.