merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Thu, 11 Apr 2019 10:44:26 +0200
branchsync
changeset 3504b64785ead9ab
parent 3503 2bfea9b0d0fd
parent 3500 03b6c918d0b4
child 3506 b64f3ffccf24
child 3507 afa3bcf153fb
merge
     1.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj	Thu Apr 11 10:44:03 2019 +0200
     1.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj	Thu Apr 11 10:44:26 2019 +0200
     1.3 @@ -157,6 +157,7 @@
     1.4      <ClInclude Include="..\..\asn.1\BIT_STRING.h" />
     1.5      <ClInclude Include="..\..\asn.1\BOOLEAN.h" />
     1.6      <ClInclude Include="..\..\asn.1\CommitAccept.h" />
     1.7 +    <ClInclude Include="..\..\asn.1\CommitAcceptForGroup.h" />
     1.8      <ClInclude Include="..\..\asn.1\CommitReject.h" />
     1.9      <ClInclude Include="..\..\asn.1\constraints.h" />
    1.10      <ClInclude Include="..\..\asn.1\constr_CHOICE.h" />
    1.11 @@ -205,6 +206,7 @@
    1.12      <ClCompile Include="..\..\asn.1\BIT_STRING.c" />
    1.13      <ClCompile Include="..\..\asn.1\BOOLEAN.c" />
    1.14      <ClCompile Include="..\..\asn.1\CommitAccept.c" />
    1.15 +    <ClCompile Include="..\..\asn.1\CommitAcceptForGroup.c" />
    1.16      <ClCompile Include="..\..\asn.1\CommitReject.c" />
    1.17      <ClCompile Include="..\..\asn.1\constraints.c" />
    1.18      <ClCompile Include="..\..\asn.1\constr_CHOICE.c" />
     2.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Thu Apr 11 10:44:03 2019 +0200
     2.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Thu Apr 11 10:44:26 2019 +0200
     2.3 @@ -168,6 +168,9 @@
     2.4      <ClInclude Include="..\..\asn.1\xer_support.h">
     2.5        <Filter>Header Files</Filter>
     2.6      </ClInclude>
     2.7 +    <ClInclude Include="..\..\asn.1\CommitAcceptForGroup.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 @@ -311,5 +314,8 @@
    2.14      <ClCompile Include="..\..\asn.1\xer_support.c">
    2.15        <Filter>Source Files</Filter>
    2.16      </ClCompile>
    2.17 +    <ClCompile Include="..\..\asn.1\CommitAcceptForGroup.c">
    2.18 +      <Filter>Source Files</Filter>
    2.19 +    </ClCompile>
    2.20    </ItemGroup>
    2.21  </Project>
    2.22 \ No newline at end of file