Merge remote-tracking branch 'upstream/master'

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

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_