Module Name:	src
Committed By:	christos
Date:		Sat Jun  3 01:50:20 UTC 2006

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ e_os2.h
	src/crypto/dist/openssl/apps: CA.pl.in speed.c
	src/crypto/dist/openssl/crypto: opensslv.h
	src/crypto/dist/openssl/crypto/asn1: asn1.h asn1_par.c t_pkey.c
	    tasn_dec.c
	src/crypto/dist/openssl/crypto/bio: bio.h bss_conn.c bss_file.c
	src/crypto/dist/openssl/crypto/bn: bn.h
	src/crypto/dist/openssl/crypto/dh: dh.h
	src/crypto/dist/openssl/crypto/dso: dso_win32.c
	src/crypto/dist/openssl/crypto/ec: ec.h
	src/crypto/dist/openssl/crypto/engine: engine.h
	src/crypto/dist/openssl/crypto/err: err.c
	src/crypto/dist/openssl/crypto/evp: evp.h
	src/crypto/dist/openssl/crypto/idea: i_skey.c idea.h
	src/crypto/dist/openssl/crypto/objects: obj_dat.c
	src/crypto/dist/openssl/crypto/rc2: rc2speed.c
	src/crypto/dist/openssl/crypto/rsa: rsa.h rsa_lib.c
	src/crypto/dist/openssl/doc: ssleay.txt
	src/crypto/dist/openssl/doc/crypto: hmac.pod
	src/crypto/dist/openssl/ssl: s23_srvr.c s2_clnt.c s2_srvr.c s3_clnt.c
	    s3_lib.c s3_srvr.c ssl.h ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c
	    ssl_sess.c ssltest.c
	src/crypto/dist/openssl/util: mkdef.pl

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.13 -r1.14 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/e_os2.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/apps/CA.pl.in \
    src/crypto/dist/openssl/apps/speed.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/opensslv.h
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/asn1/asn1.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/asn1/asn1_par.c \
    src/crypto/dist/openssl/crypto/asn1/t_pkey.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/asn1/tasn_dec.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/bio/bio.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/bio/bss_conn.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/bio/bss_file.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/dh/dh.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/dso/dso_win32.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/ec/ec.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/engine/engine.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/err/err.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/crypto/evp/evp.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/idea/i_skey.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/idea/idea.h
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/objects/obj_dat.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/rc2/rc2speed.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/rsa/rsa.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rsa/rsa_lib.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/ssleay.txt
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/crypto/hmac.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/ssl/s23_srvr.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/ssl/s2_clnt.c \
    src/crypto/dist/openssl/ssl/s2_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_asn1.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/ssl/s3_clnt.c \
    src/crypto/dist/openssl/ssl/ssl_err.c \
    src/crypto/dist/openssl/ssl/ssltest.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/ssl/s3_lib.c \
    src/crypto/dist/openssl/ssl/ssl_sess.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/ssl/s3_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/ssl/ssl_cert.c
cvs rdiff -r1.6 -r1.7 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.