32 files changed, 2 insertions, 32 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index a9387e5eaa..3dc250ac11 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -247,8 +247,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbEditorPP", "..\plugins\Db
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrashDumper", "..\plugins\CrashDumper\crshdmp_10.vcxproj", "{576EEEFD-E423-482B-879A-F0515D40B8E1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfo", "..\plugins\VersionInfo\VersionInfo_10.vcxproj", "{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenFolder", "..\plugins\OpenFolder\openFolder_10.vcxproj", "{8D233B9A-2744-4B62-94FC-7872FDDA4683}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyDetails", "..\plugins\MyDetails\mydetails_10.vcxproj", "{A4855451-6447-437C-B024-B36C3C7901EA}"
@@ -1254,14 +1252,6 @@ Global
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|Win32.Build.0 = Release|Win32
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.ActiveCfg = Release|x64
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.Build.0 = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.Build.0 = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.ActiveCfg = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.Build.0 = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.ActiveCfg = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.Build.0 = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.ActiveCfg = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.Build.0 = Release|x64
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.Build.0 = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index e3252548bf..62de3b4d68 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -281,8 +281,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbEditorPP", "..\plugins\Db
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrashDumper", "..\plugins\CrashDumper\crshdmp_10.vcxproj", "{576EEEFD-E423-482B-879A-F0515D40B8E1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfo", "..\plugins\VersionInfo\VersionInfo_10.vcxproj", "{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenFolder", "..\plugins\OpenFolder\openFolder_10.vcxproj", "{8D233B9A-2744-4B62-94FC-7872FDDA4683}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyDetails", "..\plugins\MyDetails\mydetails_10.vcxproj", "{A4855451-6447-437C-B024-B36C3C7901EA}"
@@ -1286,14 +1284,6 @@ Global
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|Win32.Build.0 = Release|Win32
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.ActiveCfg = Release|x64
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.Build.0 = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.Build.0 = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.ActiveCfg = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.Build.0 = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.ActiveCfg = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.Build.0 = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.ActiveCfg = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.Build.0 = Release|x64
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.Build.0 = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|x64.ActiveCfg = Debug|x64
@@ -1920,7 +1910,6 @@ Global
 		{129AC608-06B4-419C-8FEA-7DF5D90CE9D6} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
 		{9C6040B8-1173-40FA-A3DB-DE044CCD8250} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
 		{576EEEFD-E423-482B-879A-F0515D40B8E1} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
 		{A7D9DFA5-C34F-4B98-BEE8-5140EFCD2E8C} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
 		{21F6C0E4-DD1A-49E6-82FD-64574BB902BD} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 1a448765bf..5acacea84a 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -251,8 +251,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbEditorPP", "..\plugins\Db
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrashDumper", "..\plugins\CrashDumper\crshdmp_12.vcxproj", "{576EEEFD-E423-482B-879A-F0515D40B8E1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfo", "..\plugins\VersionInfo\VersionInfo_12.vcxproj", "{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenFolder", "..\plugins\OpenFolder\openFolder_12.vcxproj", "{8D233B9A-2744-4B62-94FC-7872FDDA4683}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyDetails", "..\plugins\MyDetails\mydetails_12.vcxproj", "{A4855451-6447-437C-B024-B36C3C7901EA}"
@@ -1264,14 +1262,6 @@ Global
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|Win32.Build.0 = Release|Win32
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.ActiveCfg = Release|x64
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.Build.0 = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.Build.0 = Debug|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.ActiveCfg = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.Build.0 = Debug|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.ActiveCfg = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|Win32.Build.0 = Release|Win32
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.ActiveCfg = Release|x64
-		{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.Build.0 = Release|x64
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|Win32.Build.0 = Debug|Win32
 		{8D233B9A-2744-4B62-94FC-7872FDDA4683}.Debug|x64.ActiveCfg = Debug|X64
diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj b/plugins/!Deprecated/VersionInfo/VersionInfo_10.vcxproj
index 0e5cf9799a..0e5cf9799a 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj
+++ b/plugins/!Deprecated/VersionInfo/VersionInfo_10.vcxproj
diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters b/plugins/!Deprecated/VersionInfo/VersionInfo_10.vcxproj.filters
index 6905e385f8..6905e385f8 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
+++ b/plugins/!Deprecated/VersionInfo/VersionInfo_10.vcxproj.filters
diff --git a/plugins/VersionInfo/VersionInfo_12.vcxproj b/plugins/!Deprecated/VersionInfo/VersionInfo_12.vcxproj
index 1c28adf4cf..1c28adf4cf 100644
--- a/plugins/VersionInfo/VersionInfo_12.vcxproj
+++ b/plugins/!Deprecated/VersionInfo/VersionInfo_12.vcxproj
diff --git a/plugins/VersionInfo/VersionInfo_12.vcxproj.filters b/plugins/!Deprecated/VersionInfo/VersionInfo_12.vcxproj.filters
index 6905e385f8..6905e385f8 100644
--- a/plugins/VersionInfo/VersionInfo_12.vcxproj.filters
+++ b/plugins/!Deprecated/VersionInfo/VersionInfo_12.vcxproj.filters
diff --git a/plugins/VersionInfo/docs/VersionInfo.html b/plugins/!Deprecated/VersionInfo/docs/VersionInfo.html
index a955874979..a955874979 100644
--- a/plugins/VersionInfo/docs/VersionInfo.html
+++ b/plugins/!Deprecated/VersionInfo/docs/VersionInfo.html
diff --git a/plugins/VersionInfo/docs/readme_versioninfo.txt b/plugins/!Deprecated/VersionInfo/docs/readme_versioninfo.txt
index 8a7d49fe7a..8a7d49fe7a 100644
--- a/plugins/VersionInfo/docs/readme_versioninfo.txt
+++ b/plugins/!Deprecated/VersionInfo/docs/readme_versioninfo.txt
diff --git a/plugins/VersionInfo/docs/rebase_versioninfo.txt b/plugins/!Deprecated/VersionInfo/docs/rebase_versioninfo.txt
index fd71ab0526..fd71ab0526 100644
--- a/plugins/VersionInfo/docs/rebase_versioninfo.txt
+++ b/plugins/!Deprecated/VersionInfo/docs/rebase_versioninfo.txt
diff --git a/plugins/VersionInfo/docs/versioninfo.gif b/plugins/!Deprecated/VersionInfo/docs/versioninfo.gif
index a0e1f8eadb..a0e1f8eadb 100644
--- a/plugins/VersionInfo/docs/versioninfo.gif
+++ b/plugins/!Deprecated/VersionInfo/docs/versioninfo.gif
diff --git a/plugins/VersionInfo/res/VersionInfo.ico b/plugins/!Deprecated/VersionInfo/res/VersionInfo.ico
index 0ae36c0c59..0ae36c0c59 100644
--- a/plugins/VersionInfo/res/VersionInfo.ico
+++ b/plugins/!Deprecated/VersionInfo/res/VersionInfo.ico
diff --git a/plugins/VersionInfo/res/resource.rc b/plugins/!Deprecated/VersionInfo/res/resource.rc
index 631a272b4e..631a272b4e 100644
--- a/plugins/VersionInfo/res/resource.rc
+++ b/plugins/!Deprecated/VersionInfo/res/resource.rc
diff --git a/plugins/VersionInfo/res/version.rc b/plugins/!Deprecated/VersionInfo/res/version.rc
index 5bfbab4754..5bfbab4754 100644
--- a/plugins/VersionInfo/res/version.rc
+++ b/plugins/!Deprecated/VersionInfo/res/version.rc
diff --git a/plugins/VersionInfo/src/CPlugin.cpp b/plugins/!Deprecated/VersionInfo/src/CPlugin.cpp
index 00f6949d38..00f6949d38 100644
--- a/plugins/VersionInfo/src/CPlugin.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/CPlugin.cpp
diff --git a/plugins/VersionInfo/src/CPlugin.h b/plugins/!Deprecated/VersionInfo/src/CPlugin.h
index f78826a44d..f78826a44d 100644
--- a/plugins/VersionInfo/src/CPlugin.h
+++ b/plugins/!Deprecated/VersionInfo/src/CPlugin.h
diff --git a/plugins/VersionInfo/src/CVersionInfo.cpp b/plugins/!Deprecated/VersionInfo/src/CVersionInfo.cpp
index ff6acb98b9..ff6acb98b9 100644
--- a/plugins/VersionInfo/src/CVersionInfo.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/CVersionInfo.cpp
diff --git a/plugins/VersionInfo/src/CVersionInfo.h b/plugins/!Deprecated/VersionInfo/src/CVersionInfo.h
index 6bff2dd8bd..6bff2dd8bd 100644
--- a/plugins/VersionInfo/src/CVersionInfo.h
+++ b/plugins/!Deprecated/VersionInfo/src/CVersionInfo.h
diff --git a/plugins/VersionInfo/src/common.h b/plugins/!Deprecated/VersionInfo/src/common.h
index 16107fd7e7..16107fd7e7 100644
--- a/plugins/VersionInfo/src/common.h
+++ b/plugins/!Deprecated/VersionInfo/src/common.h
diff --git a/plugins/VersionInfo/src/dlgHandlers.cpp b/plugins/!Deprecated/VersionInfo/src/dlgHandlers.cpp
index c6193cc0b5..c6193cc0b5 100644
--- a/plugins/VersionInfo/src/dlgHandlers.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/dlgHandlers.cpp
diff --git a/plugins/VersionInfo/src/dlgHandlers.h b/plugins/!Deprecated/VersionInfo/src/dlgHandlers.h
index b2a66f014c..b2a66f014c 100644
--- a/plugins/VersionInfo/src/dlgHandlers.h
+++ b/plugins/!Deprecated/VersionInfo/src/dlgHandlers.h
diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/!Deprecated/VersionInfo/src/hooked_events.cpp
index d718db4a09..d718db4a09 100644
--- a/plugins/VersionInfo/src/hooked_events.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/hooked_events.cpp
diff --git a/plugins/VersionInfo/src/hooked_events.h b/plugins/!Deprecated/VersionInfo/src/hooked_events.h
index e63d138998..e63d138998 100644
--- a/plugins/VersionInfo/src/hooked_events.h
+++ b/plugins/!Deprecated/VersionInfo/src/hooked_events.h
diff --git a/plugins/VersionInfo/src/main.cpp b/plugins/!Deprecated/VersionInfo/src/main.cpp
index caf9cbffe7..caf9cbffe7 100644
--- a/plugins/VersionInfo/src/main.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/main.cpp
diff --git a/plugins/VersionInfo/src/resource.h b/plugins/!Deprecated/VersionInfo/src/resource.h
index b282e8bca6..b282e8bca6 100644
--- a/plugins/VersionInfo/src/resource.h
+++ b/plugins/!Deprecated/VersionInfo/src/resource.h
diff --git a/plugins/VersionInfo/src/services.cpp b/plugins/!Deprecated/VersionInfo/src/services.cpp
index 85bc1b7347..85bc1b7347 100644
--- a/plugins/VersionInfo/src/services.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/services.cpp
diff --git a/plugins/VersionInfo/src/services.h b/plugins/!Deprecated/VersionInfo/src/services.h
index 38acbc7731..38acbc7731 100644
--- a/plugins/VersionInfo/src/services.h
+++ b/plugins/!Deprecated/VersionInfo/src/services.h
diff --git a/plugins/VersionInfo/src/stdafx.cpp b/plugins/!Deprecated/VersionInfo/src/stdafx.cpp
index 2aa7ce281e..2aa7ce281e 100644
--- a/plugins/VersionInfo/src/stdafx.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/stdafx.cpp
diff --git a/plugins/VersionInfo/src/utils.cpp b/plugins/!Deprecated/VersionInfo/src/utils.cpp
index 49bbba5a07..49bbba5a07 100644
--- a/plugins/VersionInfo/src/utils.cpp
+++ b/plugins/!Deprecated/VersionInfo/src/utils.cpp
diff --git a/plugins/VersionInfo/src/utils.h b/plugins/!Deprecated/VersionInfo/src/utils.h
index 7c8711ad3e..7c8711ad3e 100644
--- a/plugins/VersionInfo/src/utils.h
+++ b/plugins/!Deprecated/VersionInfo/src/utils.h
diff --git a/plugins/VersionInfo/src/version.h b/plugins/!Deprecated/VersionInfo/src/version.h
index 395a73c38d..395a73c38d 100644
--- a/plugins/VersionInfo/src/version.h
+++ b/plugins/!Deprecated/VersionInfo/src/version.h
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 610afd1d7d..30423de1e8 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -498,8 +498,9 @@ static renameTable[] =
 	{ _T("crashdmp.dll"),                   _T("Plugins\\crashdumper.dll") },
 	{ _T("crashrpt.dll"),                   _T("Plugins\\crashdumper.dll") },
 	{ _T("attache.dll"),                    _T("Plugins\\crashdumper.dll") },
-	{ _T("svc_vi.dll"),                     _T("Plugins\\versioninfo.dll") },
+	{ _T("svc_vi.dll"),                     _T("Plugins\\crashdumper.dll") },
 	{ _T("crashrpt.dll"),                   _T("Plugins\\crashdumper.dll") },
+	{ _T("versioninfo.dll"),                _T("Plugins\\crashdumper.dll") },
 	{ _T("advsplashscreen.dll"),            _T("Plugins\\splashscreen.dll") },
 	{ _T("import_sa.dll"),                  _T("Plugins\\import.dll") },
 	{ _T("newnr.dll"),                      _T("Plugins\\notesreminders.dll") },