diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-28 10:13:57 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 18:09:04 +0000 |
| commit | f89ded9f17a59ca1ffe4d8711c0af4d54489e105 (patch) | |
| tree | 113337ceb078215fc02850a8a5d8fc876e6fada8 /tools | |
| parent | 1fae7d725a5f51a1def0be614d503686664f2128 (diff) | |
Update Chromiumv5.12.0-beta1
Changes:
8e6f5751e5 Restore media::FFmpegGlue::InitializeFFmpeg()
0c8d188f16 Add x86 target support for gn
2a52817b6e Fix creation of 'x86' toolchain in gn
3a84c2a8bc Add support for modules limiting jumbo width
c69fdae9c7 BASELINE: Update Chromium to 69.0.3497.113
3a783ba38b Merge remote-tracking branch 'origin/upstream-master' into 69-based
a4ecaddc7c Remove missing symlink to gen from perfetto/ui/src
3f8994c671 [Backport] Use newer GrGLFunction based on templated function types rather than pointers.
Change-Id: Ibfe810c1c9b88e25e9093fbb2aa213249f1a77bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 5482add66..27062fbcf 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 = '69.0.3497.70' +chromium_version = '69.0.3497.113' chromium_branch = '3497' ninja_version = 'v1.8.2' |