Converted .hgignore to .gitignore

.gitignore

@@ -1,14 +1,12 @@
-syntax: regexp
-^asn\.1/.*\.(c|h)$
-^asn\.1/libasn1\.a$
-.*xcuserdata/
-^build/
-^local.conf
-^test_home/
-
-syntax: glob
 asn.1/Makefile.am.*
 asn.1/converter-example.mk
+asn.1/libasn1.a
+local.conf
+build/
+test_home/
+asn.1/*.c
+asn.1/*.h
+xcuserdata/
 *.orig
 *.old
 *.d
@@ -69,8 +67,11 @@ asn.1/.generated
 src/KeySync_*
 src/Sync_*
 src/sync_codec.*
+src/distribution_codec.*
 asn.1/keysync.asn1
+asn.1/keyreset.asn1
 asn.1/sync.asn1
+asn.1/distribution.asn1
 sync/.codecs
 sync/.messages
 sync/.actions
@@ -78,9 +79,23 @@ sync/.codegen
 sync/.statemachines
 sync/.copy
 test/msg_2.0.asc
-test/*Tests
 test/*.txt
 lldb-history
 *.swo
-test/.scripts
-test/.suitemaker
+*.smp
+test/EngineTests
+test/googletest
+test/tmp/*
+
+# ignore generated test data
+
+test/655_16F07F382FB3CF5DF977005D1069C7CACF9C23C6.asc
+test/655_5FBDE3C9E10552B1DD6D9763E89759391DE04053.asc
+test/655_EB4308E2D5B9FEEF7488D14CFEE4AE51914D566D.asc
+test/655_ECBA9555D9ADB1B68861B508032CCA777FFDBA14.asc
+test/655_decrypted_only.eml
+test/703_key_valid.asc
+test/test_keys/736_a.asc
+test/test_keys/736_b.asc
+test/test_mails/ENGINE-654_bob_mail.eml
+

build-windows/pEpEngine.vcxproj

@@ -72,7 +72,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;USE_SEQUOIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <EnablePREfast>false</EnablePREfast>
-      <AdditionalIncludeDirectories>$(SolutionDir)libetpan\build-windows\include;$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4703</DisableSpecificWarnings>
     </ClCompile>
@@ -104,7 +104,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;USE_SEQUOIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <TreatWarningAsError>false</TreatWarningAsError>
-      <AdditionalIncludeDirectories>$(SolutionDir)libetpan\build-windows\include;$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -135,7 +135,6 @@
     <ClCompile Include="..\src\bloblist.c" />
     <ClCompile Include="..\src\cryptotech.c" />
     <ClCompile Include="..\src\email.c" />
-    <ClCompile Include="..\src\etpan_mime.c" />
     <ClCompile Include="..\src\growing_buf.c" />
     <ClCompile Include="..\src\identity_list.c" />
     <ClCompile Include="..\src\keymanagement.c" />
@@ -174,7 +173,6 @@
     <ClInclude Include="..\src\cryptotech.h" />
     <ClInclude Include="..\src\dynamic_api.h" />
     <ClInclude Include="..\src\email.h" />
-    <ClInclude Include="..\src\etpan_mime.h" />
     <ClInclude Include="..\src\fsm_common.h" />
     <ClInclude Include="..\src\growing_buf.h" />
     <ClInclude Include="..\src\identity_list.h" />
@@ -213,8 +211,8 @@
     <Text Include="..\LICENSE.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libetpan\build-windows\libetpan\libetpan.vcxproj">
-      <Project>{ba4ded3c-e56f-4484-bfc3-9c13e461a1be}</Project>
+    <ProjectReference Include="..\..\pEpMIME\build-windows\pEpMIME.vcxproj">
+      <Project>{a6fa4848-3d26-44a3-a305-efe6d1cb57df}</Project>
     </ProjectReference>
     <ProjectReference Include="libpEpasn1\libpEpasn1.vcxproj">
       <Project>{9a67164d-b8f8-4601-a24b-28afe774d41c}</Project>

build-windows/pEpEngine.vcxproj.filters

@@ -117,9 +117,6 @@
     <ClCompile Include="..\src\pgp_sequoia.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\etpan_mime.c">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\keymanagement.h">
@@ -257,9 +254,6 @@
     <ClInclude Include="..\src\Sync_impl.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\etpan_mime.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\LICENSE.txt" />