merging sync
authorVolker Birk <vb@pep-project.org>
Tue, 16 Apr 2019 00:31:25 +0200
branchsync
changeset 352842185644df09
parent 3527 a4c50a8eeccf
parent 3526 626d29e1d4eb
child 3532 4fff402f6c9f
merging
     1.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj	Tue Apr 16 00:31:09 2019 +0200
     1.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj	Tue Apr 16 00:31:25 2019 +0200
     1.3 @@ -168,6 +168,7 @@
     1.4      <ClInclude Include="..\..\asn.1\der_encoder.h" />
     1.5      <ClInclude Include="..\..\asn.1\GroupKeys.h" />
     1.6      <ClInclude Include="..\..\asn.1\GroupKeysAndClose.h" />
     1.7 +    <ClInclude Include="..\..\asn.1\GroupTrustThisKey.h" />
     1.8      <ClInclude Include="..\..\asn.1\HandshakeAnswer.h" />
     1.9      <ClInclude Include="..\..\asn.1\HandshakeRequest.h" />
    1.10      <ClInclude Include="..\..\asn.1\Hash.h" />
    1.11 @@ -217,6 +218,7 @@
    1.12      <ClCompile Include="..\..\asn.1\der_encoder.c" />
    1.13      <ClCompile Include="..\..\asn.1\GroupKeys.c" />
    1.14      <ClCompile Include="..\..\asn.1\GroupKeysAndClose.c" />
    1.15 +    <ClCompile Include="..\..\asn.1\GroupTrustThisKey.c" />
    1.16      <ClCompile Include="..\..\asn.1\HandshakeAnswer.c" />
    1.17      <ClCompile Include="..\..\asn.1\HandshakeRequest.c" />
    1.18      <ClCompile Include="..\..\asn.1\Hash.c" />
     2.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Tue Apr 16 00:31:09 2019 +0200
     2.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Tue Apr 16 00:31:25 2019 +0200
     2.3 @@ -171,6 +171,9 @@
     2.4      <ClInclude Include="..\..\asn.1\CommitAcceptForGroup.h">
     2.5        <Filter>Header Files</Filter>
     2.6      </ClInclude>
     2.7 +    <ClInclude Include="..\..\asn.1\GroupTrustThisKey.h">
     2.8 +      <Filter>Header Files</Filter>
     2.9 +    </ClInclude>
    2.10    </ItemGroup>
    2.11    <ItemGroup>
    2.12      <ClCompile Include="..\..\asn.1\asn_codecs_prim.c">
    2.13 @@ -317,5 +320,8 @@
    2.14      <ClCompile Include="..\..\asn.1\CommitAcceptForGroup.c">
    2.15        <Filter>Source Files</Filter>
    2.16      </ClCompile>
    2.17 +    <ClCompile Include="..\..\asn.1\GroupTrustThisKey.c">
    2.18 +      <Filter>Source Files</Filter>
    2.19 +    </ClCompile>
    2.20    </ItemGroup>
    2.21  </Project>
    2.22 \ No newline at end of file