Bump v0.25.0

diff --git a/atom.gyp b/atom.gyp
index 0e391a9..c6d39d5 100644 (file)
--- 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': '<!(["python", "tools/atom_source_root.py"])',
   },

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 5564191..ef5b621 100644 (file)
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,7 +17,7 @@
   <key>CFBundleIconFile</key>
   <string>atom.icns</string>
   <key>CFBundleVersion</key>
-  <string>0.24.0</string>
+  <string>0.25.0</string>
   <key>LSMinimumSystemVersion</key>
   <string>10.8.0</string>
   <key>NSMainNibFile</key>

diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 9004d55..2c672ee 100644 (file)
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -50,8 +50,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 0,24,0,0\r
- PRODUCTVERSION 0,24,0,0\r
+ FILEVERSION 0,25,0,0\r
+ PRODUCTVERSION 0,25,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -68,12 +68,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "GitHub, Inc."\r
             VALUE "FileDescription", "Electron"\r
-            VALUE "FileVersion", "0.24.0"\r
+            VALUE "FileVersion", "0.25.0"\r
             VALUE "InternalName", "electron.exe"\r
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."\r
             VALUE "OriginalFilename", "electron.exe"\r
             VALUE "ProductName", "Electron"\r
-            VALUE "ProductVersion", "0.24.0"\r
+            VALUE "ProductVersion", "0.25.0"\r
             VALUE "SquirrelAwareVersion", "1"\r
         END\r
     END\r

diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 2223747..6ccc153 100644 (file)
--- 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 685435a..1ed1eb2 160000 (submodule)
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 685435ae679affcfcb095c546b3e884cbbc9f898
+Subproject commit 1ed1eb27098f7148440e6d23fd491efb3ba12a49