complete merging of Keepass 2.35, fix auto-merge errors

2017-01-12 05:56:20 +01:00
parent 34e572dad1
commit d0879bfe39
12 changed files with 359 additions and 758 deletions
--- a/src/KeePassLib2Android/KeePassLib2Android.csproj
+++ b/src/KeePassLib2Android/KeePassLib2Android.csproj
@@ -60,6 +60,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Collections\ProtectedBinarySet.cs" />
    <Compile Include="Collections\VariantDictionary.cs" />
    <Compile Include="Cryptography\Cipher\ChaCha20Cipher.cs" />
    <Compile Include="Cryptography\Cipher\ChaCha20Engine.cs" />