Merge branch 'master' into handleExtraObjectLiteralProperties

Conflicts:
	angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
This commit is contained in:
Daniel Rosenwasser
2015-08-17 12:28:46 -07:00
241 changed files with 45690 additions and 6535 deletions
+1 -1
View File
@@ -1822,7 +1822,7 @@ declare module chrome.tabCapture {
videoConstraints?: MediaTrackConstraints;
}
export function capture(options: CaptureOptions, callback: (stream: LocalMediaStream) => void): void;
export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
}