Mine Yalcinalp Starks 253e456e3c Merge remote-tracking branch 'upstream/master' into types-2.0 ...

Many badly resolved merge conflicts

2016-11-18 20:42:46 -08:00

..

.editorconfig

…

electron-prebuilt-tests.ts

…

electron-prebuilt.d.ts

…

electron-tests.ts

…

electron.d.ts

…

github-electron-main-tests.ts

Merge remote-tracking branch 'upstream/master' into types-2.0

2016-11-18 20:42:46 -08:00

github-electron-renderer-tests.ts

Merge remote-tracking branch 'upstream/master' into types-2.0

2016-11-18 20:42:46 -08:00

github-electron.d.ts

github-electron: Update for version 1.4.4

2016-10-22 11:41:09 +09:00

index.d.ts

…

tsconfig.json

…