merged in default sync
authorKrista Bennett <krista@pep-project.org>
Fri, 05 Oct 2018 11:31:55 +0200
branchsync
changeset 3008b2d7141a42e9
parent 3007 14fbbb7171bf
parent 3006 efaf2b690867
child 3009 2f4afc6fb3a4
child 3017 34a733193f47
merged in default
     1.1 --- a/build-windows/pEpEngine.vcxproj	Fri Oct 05 11:31:33 2018 +0200
     1.2 +++ b/build-windows/pEpEngine.vcxproj	Fri Oct 05 11:31:55 2018 +0200
     1.3 @@ -115,6 +115,7 @@
     1.4      <ClCompile Include="..\src\etpan_mime.c" />
     1.5      <ClCompile Include="..\src\identity_list.c" />
     1.6      <ClCompile Include="..\src\keymanagement.c" />
     1.7 +    <ClCompile Include="..\src\labeled_int_list.c" />
     1.8      <ClCompile Include="..\src\map_asn1.c" />
     1.9      <ClCompile Include="..\src\message.c" />
    1.10      <ClCompile Include="..\src\message_api.c" />
    1.11 @@ -149,6 +150,7 @@
    1.12      <ClInclude Include="..\src\etpan_mime.h" />
    1.13      <ClInclude Include="..\src\identity_list.h" />
    1.14      <ClInclude Include="..\src\keymanagement.h" />
    1.15 +    <ClInclude Include="..\src\labeled_int_list.h" />
    1.16      <ClInclude Include="..\src\map_asn1.h" />
    1.17      <ClInclude Include="..\src\message.h" />
    1.18      <ClInclude Include="..\src\message_api.h" />
     2.1 --- a/build-windows/pEpEngine.vcxproj.filters	Fri Oct 05 11:31:33 2018 +0200
     2.2 +++ b/build-windows/pEpEngine.vcxproj.filters	Fri Oct 05 11:31:55 2018 +0200
     2.3 @@ -108,6 +108,9 @@
     2.4      <ClCompile Include="..\src\pEp_string.c">
     2.5        <Filter>Quelldateien</Filter>
     2.6      </ClCompile>
     2.7 +    <ClCompile Include="..\src\labeled_int_list.c">
     2.8 +      <Filter>Quelldateien</Filter>
     2.9 +    </ClCompile>
    2.10    </ItemGroup>
    2.11    <ItemGroup>
    2.12      <ClInclude Include="..\src\keymanagement.h">
    2.13 @@ -212,6 +215,9 @@
    2.14      <ClInclude Include="..\src\pEp_string.h">
    2.15        <Filter>Headerdateien</Filter>
    2.16      </ClInclude>
    2.17 +    <ClInclude Include="..\src\labeled_int_list.h">
    2.18 +      <Filter>Headerdateien</Filter>
    2.19 +    </ClInclude>
    2.20    </ItemGroup>
    2.21    <ItemGroup>
    2.22      <Text Include="..\LICENSE.txt" />