Merge tag 'v0.33.6'

This commit is contained in:
Cheng Zhao 2015-10-05 19:58:47 +08:00
commit 526cee7ec3
5 changed files with 8 additions and 8 deletions

View file

@ -353,7 +353,7 @@ void NativeWindowViews::ShowInactive() {
}
void NativeWindowViews::Hide() {
web_contents()->WasHidden();
window_->Hide();
}
bool NativeWindowViews::IsVisible() {

View file

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

View file

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