It seems that many (perhaps all) files have -kb set on them - which prevents merging! I wondered what had happened to pk7_doit.c (which Stephen patched, but I had already made the same fix) - it seems it didn't get checked in because of this. Even stranger, setting cvs admin -kkv on the offending files doesn't seem to remove the -kb... Any ideas? Cheers, Ben. -- Ben Laurie |Phone: +44 (181) 735 0686| Apache Group member Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org/ and Technical Director|Email: [EMAIL PROTECTED] | A.L. Digital Ltd, |Apache-SSL author http://www.apache-ssl.org/ London, England. |"Apache: TDG" http://www.ora.com/catalog/apache/ ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List [EMAIL PROTECTED] Automated List Manager [EMAIL PROTECTED]
