summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-23 14:43:08 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-24 21:13:15 +0000
commitd10007a2b15de7a530511968b4563164cb9e581b (patch)
treeca1cb15bf2cdcfe6685046cc1490975d61634abe /tools
parent5d34532b1989356e1221dd3ff267e94085720bfe (diff)
Update Chromium
Changes: 469bce1cfb Optionally unbundle OpenH264 7cd9b9caad Disable all gpu features usage when using nouveau 951acdd317 Fix most warnings about nested else 69f24bbea4 Fix assert with devtools 2fa8f2d847 Use default MessageLoop type for NetworkConfigWatcherMac thread 4368c73808 Fix of build-time race conditions Change-Id: I1654aaa8233411421017adfcdd1d1e5ebf74d477 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/scripts/version_resolver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index e91aecfe8..4ca5d7aac 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,7 +38,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '61.0.3163.99'
+chromium_version = '61.0.3163.140'
chromium_branch = '3163'
ninja_version = 'v1.8.2'