Skip to content
Commit b215f70a authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge of stuff from main trunk, all conflicts resolved, and addition 

of dynamic lock support in the nCipher code.
parent 7ed20a21
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment