summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-11 14:29:53 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-11 14:29:53 +0200
commit8d3184d3a5a376f63aa15aa5d9297001bc1a6f7c (patch)
treea5ebad3e3667a0d14b8b41da265d01ca81973308
parent58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6 (diff)
parent387fb9377d61683bcd0f59a637afffdd9a16912c (diff)
Merge remote-tracking branch 'origin/5.15.0' into 5.15
-rw-r--r--dist/changes-5.15.02
m---------src/3rdparty0
2 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
index a5e3da7a1..630a70852 100644
--- a/dist/changes-5.15.0
+++ b/dist/changes-5.15.0
@@ -36,7 +36,7 @@ Chromium Snapshot
-----------------
- Updated the Chromium version to 80.0.3987.163
- - Applied security fixes from Chrome up to version 81.0.4044.129
+ - Applied security fixes from Chrome up to version 81.0.4044.138
General
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 6f260e5b2f717b9977045419f12c7c35d31f9a9
+Subproject 623647821aa7c7565ed5153a27c5a1bb088efbe