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

Merge the engine branch into the main trunk. All conflicts resolved. 

At the same time, add VMS support for Rijndael.
parent 1df586be
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