From ef2d61cac18f4559ddfa2fb8a7d9c750804c92a6 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 31 Aug 2018 14:26:32 +0200 Subject: [PATCH] Update sub-modules --- MSI/MSICA | 2 +- ZRCola.sln | 4 ++-- ZRCola/ZRCola.vcxproj | 2 +- ZRColaCompile/ZRColaCompile.vcxproj | 2 +- ZRColaUtils.sln | 4 ++-- lib/WinStd | 2 +- lib/stdex | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MSI/MSICA b/MSI/MSICA index b90f3d7..04d84ba 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit b90f3d76971a044c2318f2bd9605ab8194028438 +Subproject commit 04d84baa78b904a0c1202e51480729e07916e6be diff --git a/ZRCola.sln b/ZRCola.sln index 8913c7f..37f82bc 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -16,11 +16,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index b6c5d16..f0183a9 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -117,7 +117,7 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj index 5e850ab..bee508f 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj +++ b/ZRColaCompile/ZRColaCompile.vcxproj @@ -63,7 +63,7 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index 7907dc7..4ecb69c 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -14,7 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaComp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject @@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaIn EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallRu", "ZRColaInstall\ZRColaInstallRu.vcxproj", "{2551B561-5E5B-497E-AE01-11519F91EF19}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/lib/WinStd b/lib/WinStd index a3c195a..f2f62d5 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit a3c195a98a39db001971e5991ac9c423a84841aa +Subproject commit f2f62d5cacb71d60626274bfb45daae9c086f620 diff --git a/lib/stdex b/lib/stdex index 7b696b8..55ea9fa 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 7b696b8e9fa0ec6e8841998d66b91cc9124cb921 +Subproject commit 55ea9fa324d690a9ffc3fd006a98feea2a1f79dd