zhengbli
|
62e37b17e1
|
Merge commit 'origin/master~100' into zhengbli_merge
|
2016-10-24 20:34:59 -07:00 |
|
Ryan Cavanaugh
|
b488f3cb5f
|
Merge remote-tracking branch 'upstream/master' into merge_7_25
|
2016-07-27 10:57:46 -07:00 |
|
Ryan Cavanaugh
|
ede3f0a99c
|
Merge commit 'upstream/master~550' into merge_7_25
|
2016-07-26 11:29:27 -07:00 |
|
Ryan Cavanaugh
|
e808e8e062
|
Remove unneeded references
|
2016-05-10 12:22:25 -07:00 |
|
Ryan Cavanaugh
|
e7c111c4b7
|
Merge remote-tracking branch 'upstream/master' into types2.0
Add tsconfig files everywhere
# Conflicts:
# azure-mobile-services-client/AzureMobileServicesClient.d.ts
# bookshelf/bookshelf.d.ts
# hapi/hapi.d.ts
# helmet/helmet.d.ts
# mongodb/mongodb.d.ts
# nock/nock.d.ts
# react-bootstrap/react-bootstrap.d.ts
# react-helmet/react-helmet.d.ts
# restify/restify.d.ts
# sequelize/sequelize.d.ts
|
2016-04-27 20:40:21 -07:00 |
|
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 |
|
Ryan Cavanaugh
|
4f7524fc65
|
Rename files and folders to match their module definitions
|
2016-04-05 15:50:30 -07:00 |
|