Ryan Cavanaugh
|
0e9df16001
|
Merge remote-tracking branch 'upstream/types-2.0' into types2.0
# Conflicts:
# electron/github-electron.app.d.ts
# electron/github-electron.auto-updater.d.ts
# electron/github-electron.browser-window.d.ts
# electron/github-electron.clipboard.d.ts
# electron/github-electron.content-tracing.d.ts
# electron/github-electron.crash-reporter.d.ts
# electron/github-electron.desktop-capturer.d.ts
# electron/github-electron.dialog.d.ts
# electron/github-electron.dom.d.ts
# electron/github-electron.event-emitter.d.ts
# electron/github-electron.global-shortcut.d.ts
# electron/github-electron.ipc-main.d.ts
# electron/github-electron.ipc-renderer.d.ts
# electron/github-electron.menu-item.d.ts
# electron/github-electron.menu.d.ts
# electron/github-electron.native-image.d.ts
# electron/github-electron.power-monitor.d.ts
# electron/github-electron.power-save-blocker.d.ts
# electron/github-electron.protocol.d.ts
# electron/github-electron.remote.d.ts
# electron/github-electron.screen.d.ts
# electron/github-electron.session.d.ts
# electron/github-electron.shell.d.ts
# electron/github-electron.tray.d.ts
# electron/github-electron.web-contents.d.ts
# electron/github-electron.web-frame.d.ts
|
2016-04-08 12:47:22 -07:00 |
|