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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Vjekoslav Ratkajec 2016-02-05 09:11:24 +01:00
commit d0d336eee7
8 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/api/browser-window.md
View file

@ -785,7 +785,7 @@ cleared
* `description` String - a description that will be provided to Accessibility
screen readers
Sets a 16px overlay onto the current taskbar icon, usually used to convey some
Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to convey some
sort of application status or to passively notify the user.
### `win.setHasShadow(hasShadow)` _OS X_

3
docs/tutorial/application-distribution.md
View file

@ -61,8 +61,7 @@ before distributing it to users.
### Windows
You can rename `electron.exe` to any name you like, and edit its icon and other
information with tools like [rcedit](https://github.com/atom/rcedit) or
[ResEdit](http://www.resedit.net).
information with tools like [rcedit](https://github.com/atom/rcedit).
### OS X