Skip to content

fix#6418 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 18, 2016
Merged

fix#6418 #46

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee39b6d
fix#6418
YuichiNukiyama Jan 13, 2016
086167b
fetch latest branch
YuichiNukiyama Jan 14, 2016
18ffc20
resolve conflict
YuichiNukiyama Jan 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
resolve conflict 
resolve conflict
  • Loading branch information
@YuichiNukiyama
YuichiNukiyama committed Jan 15, 2016
commit 18ffc20bcbf66cba1aa820fd36d5e5fb8b0db7ce
7 changes: 7 additions & 0 deletions inputfiles/overridingTypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@
"interface": "DataTransferItemList",
"signatures": ["[index: number]: DataTransferItem"]
},
{
"kind": "constructor",
"interface": "StorageEvent",
"signatures": [
"new (type: string, eventInitDict?: StorageEventInit): StorageEvent"
]
},
{
"kind": "method",
"interface": "Window",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.