Merge pull request #1261 from vegemite4me/master

Added Observable.zip() which was missing.
This commit is contained in:
basarat
2013-11-15 02:48:13 -08:00
+2 -1
View File
@@ -406,6 +406,7 @@ declare module Rx {
merge<T>(scheduler: IScheduler, sources: IObservable<T>[]): IObservable<T>;
onErrorResumeNext<T>(...sources: IObservable<T>[]): IObservable<T>;
onErrorResumeNext<T>(sources: IObservable<T>[]): IObservable<T>;
zip<T>(...soucesAndResultSelector: any[]): IObservable<T>;
}
var Observable: Observable;
@@ -456,4 +457,4 @@ declare module Rx {
onError(exception: any): void;
onCompleted(): void;
}
}
}