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

- merged in the latest from the main trunk, fixed all conflicts 

- implemented nCipher support via the nfhwcrhk library (not well tested).
- make update + make depend
parent 05d909c5
Expand all 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