From 7f9ae75f8c8b2d0ae92103c36ef835c488271ac8 Mon Sep 17 00:00:00 2001
From: Chris Colbert <sccolbert@gmail.com>
Date: Wed, 25 Feb 2015 11:51:47 -0500
Subject: [PATCH] update signature of Promise.all and Promise.race

---
 es6-promise/es6-promise.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es6-promise/es6-promise.d.ts b/es6-promise/es6-promise.d.ts
index 2718388070..4a793e540b 100644
--- a/es6-promise/es6-promise.d.ts
+++ b/es6-promise/es6-promise.d.ts
@@ -54,12 +54,12 @@ declare module Promise {
 	 * the array passed to all can be a mixture of promise-like objects and other objects.
 	 * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
 	 */
-	function all<R>(promises: Promise<R>[]): Promise<R[]>;
+	function all<R>(promises: (R | Thenable<R>)[]): Promise<R[]>;
 
 	/**
 	 * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
 	 */
-	function race<R>(promises: Promise<R>[]): Promise<R>;
+	function race<R>(promises: (R | Thenable<R>)[]): Promise<R>;
 }
 
 declare module 'es6-promise' {