merge master

This commit is contained in:
isidor
2017-09-20 10:08:51 +02:00
90 changed files with 2328 additions and 465 deletions

View File

@@ -367,7 +367,7 @@ export type SCMRawResourceSplices = [
];
export interface MainThreadSCMShape extends IDisposable {
$registerSourceControl(handle: number, id: string, label: string): void;
$registerSourceControl(handle: number, id: string, label: string, rootUri: string | undefined): void;
$updateSourceControl(handle: number, features: SCMProviderFeatures): void;
$unregisterSourceControl(handle: number): void;