Skip to content
Commit d8c4d0e8 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 b215f70a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment