merge from master

2 files changed, 47 insertions, 44 deletions

diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index 2947b27405..1525183eff 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -1,4 +1,3 @@
-dbchecker.bat
 Libs\api-ms-win-core-console-l1-1-0.dll
 Libs\api-ms-win-core-datetime-l1-1-0.dll
 Libs\api-ms-win-core-debug-l1-1-0.dll
@@ -67,6 +66,7 @@ Libs\Pcre16.mir
 Libs\sqlite3.mir
 Libs\ssleay32.mir
 Libs\Zlib.mir
+Icons\Proto_Dummy.dll
 Icons\Proto_Facebook.dll
 Icons\Proto_GG.dll
 Icons\Proto_ICQ.dll
@@ -83,6 +83,7 @@ Plugins\Clist_modern.dll
 Plugins\CrashDumper.dll
 Plugins\Dbx_mdbx.dll
 Plugins\Dbx_mmap.dll
+Plugins\Dummy.dll
 Plugins\Facebook.dll
 Plugins\GG.dll
 Plugins\ICQ.dll
diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt
index 58545793b1..69bf537ed7 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.txt
+++ b/tools/build_scripts/z2_PackPluginUpdater.txt
@@ -1,46 +1,46 @@
-api-ms-win-core-console-l1-1-0.dll
-api-ms-win-core-datetime-l1-1-0.dll
-api-ms-win-core-debug-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-0.dll
-api-ms-win-core-file-l1-1-0.dll
-api-ms-win-core-file-l1-2-0.dll
-api-ms-win-core-file-l2-1-0.dll
-api-ms-win-core-handle-l1-1-0.dll
-api-ms-win-core-heap-l1-1-0.dll
-api-ms-win-core-interlocked-l1-1-0.dll
-api-ms-win-core-libraryloader-l1-1-0.dll
-api-ms-win-core-localization-l1-2-0.dll
-api-ms-win-core-memory-l1-1-0.dll
-api-ms-win-core-namedpipe-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-1.dll
-api-ms-win-core-profile-l1-1-0.dll
-api-ms-win-core-rtlsupport-l1-1-0.dll
-api-ms-win-core-string-l1-1-0.dll
-api-ms-win-core-synch-l1-1-0.dll
-api-ms-win-core-synch-l1-2-0.dll
-api-ms-win-core-sysinfo-l1-1-0.dll
-api-ms-win-core-timezone-l1-1-0.dll
-api-ms-win-core-util-l1-1-0.dll
-api-ms-win-crt-conio-l1-1-0.dll
-api-ms-win-crt-convert-l1-1-0.dll
-api-ms-win-crt-environment-l1-1-0.dll
-api-ms-win-crt-filesystem-l1-1-0.dll
-api-ms-win-crt-heap-l1-1-0.dll
-api-ms-win-crt-locale-l1-1-0.dll
-api-ms-win-crt-math-l1-1-0.dll
-api-ms-win-crt-multibyte-l1-1-0.dll
-api-ms-win-crt-private-l1-1-0.dll
-api-ms-win-crt-process-l1-1-0.dll
-api-ms-win-crt-runtime-l1-1-0.dll
-api-ms-win-crt-stdio-l1-1-0.dll
-api-ms-win-crt-string-l1-1-0.dll
-api-ms-win-crt-time-l1-1-0.dll
-api-ms-win-crt-utility-l1-1-0.dll
-msvcp140.dll
-ucrtbase.dll
-vcruntime140.dll
+Libs\api-ms-win-core-console-l1-1-0.dll
+Libs\api-ms-win-core-datetime-l1-1-0.dll
+Libs\api-ms-win-core-debug-l1-1-0.dll
+Libs\api-ms-win-core-errorhandling-l1-1-0.dll
+Libs\api-ms-win-core-file-l1-1-0.dll
+Libs\api-ms-win-core-file-l1-2-0.dll
+Libs\api-ms-win-core-file-l2-1-0.dll
+Libs\api-ms-win-core-handle-l1-1-0.dll
+Libs\api-ms-win-core-heap-l1-1-0.dll
+Libs\api-ms-win-core-interlocked-l1-1-0.dll
+Libs\api-ms-win-core-libraryloader-l1-1-0.dll
+Libs\api-ms-win-core-localization-l1-2-0.dll
+Libs\api-ms-win-core-memory-l1-1-0.dll
+Libs\api-ms-win-core-namedpipe-l1-1-0.dll
+Libs\api-ms-win-core-processenvironment-l1-1-0.dll
+Libs\api-ms-win-core-processthreads-l1-1-0.dll
+Libs\api-ms-win-core-processthreads-l1-1-1.dll
+Libs\api-ms-win-core-profile-l1-1-0.dll
+Libs\api-ms-win-core-rtlsupport-l1-1-0.dll
+Libs\api-ms-win-core-string-l1-1-0.dll
+Libs\api-ms-win-core-synch-l1-1-0.dll
+Libs\api-ms-win-core-synch-l1-2-0.dll
+Libs\api-ms-win-core-sysinfo-l1-1-0.dll
+Libs\api-ms-win-core-timezone-l1-1-0.dll
+Libs\api-ms-win-core-util-l1-1-0.dll
+Libs\api-ms-win-crt-conio-l1-1-0.dll
+Libs\api-ms-win-crt-convert-l1-1-0.dll
+Libs\api-ms-win-crt-environment-l1-1-0.dll
+Libs\api-ms-win-crt-filesystem-l1-1-0.dll
+Libs\api-ms-win-crt-heap-l1-1-0.dll
+Libs\api-ms-win-crt-locale-l1-1-0.dll
+Libs\api-ms-win-crt-math-l1-1-0.dll
+Libs\api-ms-win-crt-multibyte-l1-1-0.dll
+Libs\api-ms-win-crt-private-l1-1-0.dll
+Libs\api-ms-win-crt-process-l1-1-0.dll
+Libs\api-ms-win-crt-runtime-l1-1-0.dll
+Libs\api-ms-win-crt-stdio-l1-1-0.dll
+Libs\api-ms-win-crt-string-l1-1-0.dll
+Libs\api-ms-win-crt-time-l1-1-0.dll
+Libs\api-ms-win-crt-utility-l1-1-0.dll
+Libs\msvcp140.dll
+Libs\ucrtbase.dll
+Libs\vcruntime140.dll
 Core\StdAutoAway.dll
 Core\StdAway.dll
 Core\StdClist.dll
@@ -56,7 +56,9 @@ Core\StdUserInfo.dll
 Core\StdUserOnline.dll
 Plugins\Dbx_mmap.dll
 Plugins\Dbx_mdbx.dll
+Plugins\Dummy.dll
 Plugins\Import.dll
+Icons\Proto_Dummy.dll
 Icons\Proto_MetaContacts.dll
 Libs\FreeImage.mir
 Libs\mir_app.mir