Merge branch 'master' into TestExportPrivateKeys

This commit is contained in:
SET
2020-11-24 20:13:23 +01:00
19 changed files with 422 additions and 115 deletions

View File

@@ -6,6 +6,7 @@
projectFiles="true">
<itemPath>AppConfig.h</itemPath>
<itemPath>GpgMECWorker.h</itemPath>
<itemPath>GpgMELogger.h</itemPath>
<itemPath>GpgMEWorker.h</itemPath>
<itemPath>K7Main.h</itemPath>
<itemPath>KeyEdit.h</itemPath>
@@ -104,6 +105,8 @@
</item>
<item path="GpgMECWorker.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMELogger.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMEWorker.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="GpgMEWorker.h" ex="false" tool="3" flavor2="0">
@@ -224,6 +227,8 @@
</item>
<item path="GpgMECWorker.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMELogger.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMEWorker.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="GpgMEWorker.h" ex="false" tool="3" flavor2="0">
@@ -348,6 +353,8 @@
</item>
<item path="GpgMECWorker.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMELogger.h" ex="false" tool="3" flavor2="0">
</item>
<item path="GpgMEWorker.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="GpgMEWorker.h" ex="false" tool="3" flavor2="0">

View File

@@ -13,8 +13,6 @@
<gdb_interceptlist>
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
</gdb_interceptlist>
<gdb_signals>
</gdb_signals>
<gdb_options>
<DebugOptions>
</DebugOptions>