summaryrefslogtreecommitdiff
path: root/tools/scripts/version_resolver.py
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-10 16:56:53 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-25 10:00:35 +0000
commit44d980ff67867cb65bfe8035326be2b461ca7172 (patch)
treeb17af444fe62213fd7ea4d740c1abbe8d6b1002d /tools/scripts/version_resolver.py
parent38944be4048e19a0ab6f3b8961f58e36048b53a8 (diff)
downloadqtwebengine-44d980ff67867cb65bfe8035326be2b461ca7172.tar.gz
Rebasing on Chromium 45
Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools/scripts/version_resolver.py')
-rw-r--r--tools/scripts/version_resolver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index b223e4fef..3e3f77d62 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,8 +51,8 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '44.0.2403.91'
-chromium_branch = '2403'
+chromium_version = '45.0.2454.40'
+chromium_branch = '2454'
ninja_version = 'v1.5.3'
json_url = 'http://omahaproxy.appspot.com/all.json'