aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorcnbatch <cnbatch@gmail.com>2021-05-21 15:36:51 +0800
committerGitHub <noreply@github.com>2021-05-21 00:36:51 -0700
commiteed75c0ad57c9e41537f4006debca6cdd7021f25 (patch)
tree3ca22a8957beec6f5bc5d37cee6ada63e54d99c4 /versions
parent2e9b73fc8b736e13a5df780eaae11305822c2f19 (diff)
downloadvcpkg-eed75c0ad57c9e41537f4006debca6cdd7021f25.tar.gz
vcpkg-eed75c0ad57c9e41537f4006debca6cdd7021f25.zip
[wxwidgets] Merge fix-patch from upstream (#18016)
* [wxwidgets] Merge fix-patch from upstream Upstream fix: https://github.com/wxWidgets/wxWidgets/commit/94b399418cf37df6934ae3defbec8626af2cd965 * [wxwidgets] Merge fix-patch from upstream Upstream fix: https://github.com/wxWidgets/wxWidgets/commit/94b399418cf37df6934ae3defbec8626af2cd965
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/w-/wxwidgets.json5
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index e53c59fc4..6c470abd3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6514,7 +6514,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 1
+ "port-version": 2
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index 0e85fc33b..72eaf1357 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9",
+ "version-semver": "3.1.5",
+ "port-version": 2
+ },
+ {
"git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7",
"version-semver": "3.1.5",
"port-version": 1