mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

Merge branch 'master' of https://github.com/atom/electron

Browse source
This commit is contained in:
Sam Eaton 2015-06-11 07:13:45 -06:00
commit b68d559329
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom.gyp
View file

@ -4,7 +4,7 @@
'product_name%': 'Electron', 'product_name%': 'Electron',
'company_name%': 'GitHub, Inc', 'company_name%': 'GitHub, Inc',
'company_abbr%': 'github', 'company_abbr%': 'github',
'version%': '0.27.3', 'version%': '0.28.0',
'atom_source_root': '<!(["python", "tools/atom_source_root.py"])', 'atom_source_root': '<!(["python", "tools/atom_source_root.py"])',
}, },

2
atom/browser/resources/mac/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>atom.icns</string> <string>atom.icns</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.27.3</string> <string>0.28.0</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.8.0</string> <string>10.8.0</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>

8
atom/browser/resources/win/atom.rc
View file

@ -50,8 +50,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,27,3,0 FILEVERSION 0,28,0,0
PRODUCTVERSION 0,27,3,0 PRODUCTVERSION 0,28,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -68,12 +68,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GitHub, Inc." VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Electron" VALUE "FileDescription", "Electron"
VALUE "FileVersion", "0.27.3" VALUE "FileVersion", "0.28.0"
VALUE "InternalName", "electron.exe" VALUE "InternalName", "electron.exe"
VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "electron.exe" VALUE "OriginalFilename", "electron.exe"
VALUE "ProductName", "Electron" VALUE "ProductName", "Electron"
VALUE "ProductVersion", "0.27.3" VALUE "ProductVersion", "0.28.0"
VALUE "SquirrelAwareVersion", "1" VALUE "SquirrelAwareVersion", "1"
END END
END END

4
atom/common/atom_version.h
View file

@ -6,8 +6,8 @@
#define ATOM_VERSION_H #define ATOM_VERSION_H
#define ATOM_MAJOR_VERSION 0 #define ATOM_MAJOR_VERSION 0
#define ATOM_MINOR_VERSION 27 #define ATOM_MINOR_VERSION 28
#define ATOM_PATCH_VERSION 3 #define ATOM_PATCH_VERSION 0
#define ATOM_VERSION_IS_RELEASE 1 #define ATOM_VERSION_IS_RELEASE 1

2
spec/webview-spec.coffee
View file

@ -54,7 +54,7 @@ describe '<webview> tag', ->
assert.equal e.message, 'function' assert.equal e.message, 'function'
done() done()
webview.addEventListener 'console-message', listener2 webview.addEventListener 'console-message', listener2
webview.src = "file://#{fixtures}/pages/native-module.html" webview.reload()
webview.addEventListener 'did-finish-load', listener webview.addEventListener 'did-finish-load', listener
webview.setAttribute 'nodeintegration', 'on' webview.setAttribute 'nodeintegration', 'on'
webview.src = "file://#{fixtures}/pages/native-module.html" webview.src = "file://#{fixtures}/pages/native-module.html"