From 13ed03808261d44005c24a16833f0994dc4e1b1c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 9 Jan 2015 17:23:48 -0800 Subject: [PATCH] Upgrade to Chrome 40.0.2214.72 --- atom/common/chrome_version.h | 2 +- script/lib/config.py | 2 +- vendor/brightray | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h index e684321e1773..f9b74e6086fa 100644 --- a/atom/common/chrome_version.h +++ b/atom/common/chrome_version.h @@ -8,7 +8,7 @@ #ifndef ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_ -#define CHROME_VERSION_STRING "39.0.2171.65" +#define CHROME_VERSION_STRING "40.0.2214.72" #define CHROME_VERSION "v" CHROME_VERSION_STRING #endif // ATOM_COMMON_CHROME_VERSION_H_ diff --git a/script/lib/config.py b/script/lib/config.py index f52098bdaeca..2dad428c8058 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -4,7 +4,7 @@ import platform import sys BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '6300862b4b16bd171f00ae566b697098c29743f7' +LIBCHROMIUMCONTENT_COMMIT = 'f588e31c2f0984b7badd18c7cb17703cf75bfafb' ARCH = { 'cygwin': '32bit', diff --git a/vendor/brightray b/vendor/brightray index a45009446ac3..f1556936b01a 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit a45009446ac3279b385b1de1f3226251e7f0e634 +Subproject commit f1556936b01a2ec66d6af34ab26d839dc80dc266