merge
authorKrista Bennett <krista@pep-project.org>
Fri, 16 Feb 2018 08:35:34 +0100
changeset 25109ef5d24075d4
parent 2509 dde6a233c9dd
parent 2508 3f9d0cb2cb56
child 2511 cce0790ba787
child 2512 1aa220fdf1c7
merge
     1.1 --- a/build-windows/pEpEngine.vcxproj	Fri Feb 16 08:35:04 2018 +0100
     1.2 +++ b/build-windows/pEpEngine.vcxproj	Fri Feb 16 08:35:34 2018 +0100
     1.3 @@ -121,6 +121,7 @@
     1.4      <ClCompile Include="..\src\mime.c" />
     1.5      <ClCompile Include="..\src\openpgp_compat.c" />
     1.6      <ClCompile Include="..\src\pEpEngine.c" />
     1.7 +    <ClCompile Include="..\src\pEp_string.c" />
     1.8      <ClCompile Include="..\src\pgp_gpg.c" />
     1.9      <ClCompile Include="..\src\platform_windows.cpp" />
    1.10      <ClCompile Include="..\src\resource_id.c" />
    1.11 @@ -155,6 +156,7 @@
    1.12      <ClInclude Include="..\src\openpgp_compat.h" />
    1.13      <ClInclude Include="..\src\pEpEngine.h" />
    1.14      <ClInclude Include="..\src\pEp_internal.h" />
    1.15 +    <ClInclude Include="..\src\pEp_string.h" />
    1.16      <ClInclude Include="..\src\pgp_gpg.h" />
    1.17      <ClInclude Include="..\src\pgp_gpg_internal.h" />
    1.18      <ClInclude Include="..\src\platform.h" />
     2.1 --- a/build-windows/pEpEngine.vcxproj.filters	Fri Feb 16 08:35:04 2018 +0100
     2.2 +++ b/build-windows/pEpEngine.vcxproj.filters	Fri Feb 16 08:35:34 2018 +0100
     2.3 @@ -105,6 +105,9 @@
     2.4      <ClCompile Include="..\src\resource_id.c">
     2.5        <Filter>Quelldateien</Filter>
     2.6      </ClCompile>
     2.7 +    <ClCompile Include="..\src\pEp_string.c">
     2.8 +      <Filter>Quelldateien</Filter>
     2.9 +    </ClCompile>
    2.10    </ItemGroup>
    2.11    <ItemGroup>
    2.12      <ClInclude Include="..\src\keymanagement.h">
    2.13 @@ -206,6 +209,9 @@
    2.14      <ClInclude Include="..\src\resource_id.h">
    2.15        <Filter>Headerdateien</Filter>
    2.16      </ClInclude>
    2.17 +    <ClInclude Include="..\src\pEp_string.h">
    2.18 +      <Filter>Headerdateien</Filter>
    2.19 +    </ClInclude>
    2.20    </ItemGroup>
    2.21    <ItemGroup>
    2.22      <Text Include="..\LICENSE.txt" />