diff --git a/atom.gyp b/atom.gyp index 0e391a998f42..c6d39d544312 100644 --- a/atom.gyp +++ b/atom.gyp @@ -4,7 +4,7 @@ 'product_name%': 'Electron', 'company_name%': 'GitHub, Inc', 'company_abbr%': 'github', - 'version%': '0.24.0', + 'version%': '0.25.0', 'atom_source_root': 'CFBundleIconFile atom.icns CFBundleVersion - 0.24.0 + 0.25.0 LSMinimumSystemVersion 10.8.0 NSMainNibFile diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index 9004d559012d..2c672eeb731d 100644 --- a/atom/browser/resources/win/atom.rc +++ b/atom/browser/resources/win/atom.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,24,0,0 - PRODUCTVERSION 0,24,0,0 + FILEVERSION 0,25,0,0 + PRODUCTVERSION 0,25,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BEGIN VALUE "CompanyName", "GitHub, Inc." VALUE "FileDescription", "Electron" - VALUE "FileVersion", "0.24.0" + VALUE "FileVersion", "0.25.0" VALUE "InternalName", "electron.exe" VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "OriginalFilename", "electron.exe" VALUE "ProductName", "Electron" - VALUE "ProductVersion", "0.24.0" + VALUE "ProductVersion", "0.25.0" VALUE "SquirrelAwareVersion", "1" END END diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index 2223747054d8..6ccc153d9357 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -6,7 +6,7 @@ #define ATOM_VERSION_H #define ATOM_MAJOR_VERSION 0 -#define ATOM_MINOR_VERSION 24 +#define ATOM_MINOR_VERSION 25 #define ATOM_PATCH_VERSION 0 #define ATOM_VERSION_IS_RELEASE 1 diff --git a/vendor/brightray b/vendor/brightray index 685435ae679a..1ed1eb27098f 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 685435ae679affcfcb095c546b3e884cbbc9f898 +Subproject commit 1ed1eb27098f7148440e6d23fd491efb3ba12a49