Merge pull request #4775 from atom/delay-load-powrprof

Delay loading powrprof.dll
This commit is contained in:
Cheng Zhao 2016-03-13 11:38:39 +09:00
commit bc9c48261a
6 changed files with 10 additions and 10 deletions

View file

@ -4,7 +4,7 @@
'product_name%': 'Electron',
'company_name%': 'GitHub, Inc',
'company_abbr%': 'github',
'version%': '0.37.0',
'version%': '0.37.1',
},
'includes': [
'filenames.gypi',

View file

@ -17,9 +17,9 @@
<key>CFBundleIconFile</key>
<string>atom.icns</string>
<key>CFBundleVersion</key>
<string>0.37.0</string>
<string>0.37.1</string>
<key>CFBundleShortVersionString</key>
<string>0.37.0</string>
<string>0.37.1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>

View file

@ -56,8 +56,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,37,0,0
PRODUCTVERSION 0,37,0,0
FILEVERSION 0,37,1,0
PRODUCTVERSION 0,37,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -74,12 +74,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Electron"
VALUE "FileVersion", "0.37.0"
VALUE "FileVersion", "0.37.1"
VALUE "InternalName", "electron.exe"
VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "electron.exe"
VALUE "ProductName", "Electron"
VALUE "ProductVersion", "0.37.0"
VALUE "ProductVersion", "0.37.1"
VALUE "SquirrelAwareVersion", "1"
END
END

View file

@ -7,7 +7,7 @@
#define ATOM_MAJOR_VERSION 0
#define ATOM_MINOR_VERSION 37
#define ATOM_PATCH_VERSION 0
#define ATOM_PATCH_VERSION 1
#define ATOM_VERSION_IS_RELEASE 1

View file

@ -1,6 +1,6 @@
{
"name": "electron",
"version": "0.37.0",
"version": "0.37.1",
"devDependencies": {
"asar": "^0.10.0",
"eslint": "^2.1.0",

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit c1f3bb4ecf4cacb33bf56b9ebd3656a4defbeb64
Subproject commit d6bafa3ac1b56b24e8944ebbc87ed51ad417a21d