Bump v1.5.0

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index f69fbc5c40409a1db7a3f8353bfffe46a21d6054..dd0f650f51185ff2d7698685c06e166507b80579 100644 (file)
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.4.15</string>
+  <string>1.5.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.4.15</string>
+  <string>1.5.0</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>

diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index c7a067984484d859db564046a9aba048b6979929..811d61e227d2012667329896215a3cd4203b00dd 100644 (file)
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,15,0\r
- PRODUCTVERSION 1,4,15,0\r
+ FILEVERSION 1,5,0,0\r
+ PRODUCTVERSION 1,5,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -74,12 +74,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "GitHub, Inc."\r
             VALUE "FileDescription", "Electron"\r
-            VALUE "FileVersion", "1.4.15"\r
+            VALUE "FileVersion", "1.5.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", "1.4.15"\r
+            VALUE "ProductVersion", "1.5.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 f073afb5621ce56baa578a4f1737ebac7cc5389a..dc8159de213954f34745dc336ab43abf3d5f7fdc 100644 (file)
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -6,8 +6,8 @@
 #define ATOM_COMMON_ATOM_VERSION_H_
 
 #define ATOM_MAJOR_VERSION 1
-#define ATOM_MINOR_VERSION 4
-#define ATOM_PATCH_VERSION 15
+#define ATOM_MINOR_VERSION 5
+#define ATOM_PATCH_VERSION 0
 
 #define ATOM_VERSION_IS_RELEASE 1
 

diff --git a/electron.gyp b/electron.gyp
index bd55c1e9dd4aed0a30479c585612853b7fddb4a8..f12129242554fa69a6e1400535148d1df4d013a1 100644 (file)
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.4.15',
+    'version%': '1.5.0',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [

diff --git a/package.json b/package.json
index e090c24befb0bc19711d7a37719de7102f1d5033..d4008db52bb820e27def22ade972d23e44862ef2 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.4.15",
+  "version": "1.5.0",
   "devDependencies": {
     "asar": "^0.11.0",
     "browserify": "^13.1.0",