summaryrefslogtreecommitdiff
path: root/chromium/build
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 13:58:51 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 14:05:07 +0000
commitf45cda20b1e1eebe317f282b4bfa2616279f9acd (patch)
tree43430e753cfc39e9940612aecc24a3625cc39f36 /chromium/build
parent60a2f0b29469a967e01304d6d47b2b88bf39cb12 (diff)
parent466052c4e7c052268fd931888cd58961da94c586 (diff)
downloadqtwebengine-chromium-f45cda20b1e1eebe317f282b4bfa2616279f9acd.tar.gz
Merge remote-tracking branch 'origin/upstream-master' into 69-based
Includes fix for CVE-2018-17465 Change-Id: I305258170c5a398c62e84002532344e95e61b20e
Diffstat (limited to 'chromium/build')
-rw-r--r--chromium/build/util/LASTCHANGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE
index 5c5e9cdfd08..7738287b783 100644
--- a/chromium/build/util/LASTCHANGE
+++ b/chromium/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=813bf9b1a5703461864fe56d23b6224480581ae1-refs/branch-heads/3497@{#969}
+LASTCHANGE=cdec0adf58c577876de3d8f073dce520f0829431-refs/branch-heads/3497@{#988}