From b5032fd374278a4215541e1f34a96a69068d8a48 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 29 Apr 2015 10:49:18 -0700
Subject: [PATCH] fix(build): revert typescript upgrade which broke the build.

This reverts commit a7a9463624f40c17105abe4574794e0fc8302c24.
This reverts commit 59824e40e8354e5b8c70c8c0f81dfce2c0ecb2f4.
---
 modules/angular2/globals.ts         | 1 +
 modules/angular2/src/facade/math.ts | 2 +-
 modules/angular2/tsd.json           | 5 ++++-
 npm-shrinkwrap.clean.json           | 2 +-
 npm-shrinkwrap.json                 | 4 ++--
 package.json                        | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/angular2/globals.ts b/modules/angular2/globals.ts
index e0b1de5e97..a678ed9bbf 100644
--- a/modules/angular2/globals.ts
+++ b/modules/angular2/globals.ts
@@ -19,5 +19,6 @@ interface Window {
   JSON: typeof JSON;
   Math: typeof Math;
   assert: typeof assert;
+  NaN: typeof NaN;
   gc(): void;
 }
diff --git a/modules/angular2/src/facade/math.ts b/modules/angular2/src/facade/math.ts
index 4c15bf1e3e..f813fd8d85 100644
--- a/modules/angular2/src/facade/math.ts
+++ b/modules/angular2/src/facade/math.ts
@@ -6,4 +6,4 @@ import {global} from 'angular2/src/facade/lang';
 export var __esModule = true;
 
 export var Math = global.Math;
-export var NaN = typeof NaN;
+export var NaN = global.NaN;
diff --git a/modules/angular2/tsd.json b/modules/angular2/tsd.json
index c04d5adc31..3ce6280f40 100644
--- a/modules/angular2/tsd.json
+++ b/modules/angular2/tsd.json
@@ -9,7 +9,7 @@
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
     "hammerjs/hammerjs.d.ts": {
-      "commit": "22c44d95912a07f81c103a694330b15b92f7cb40"
+      "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
     "jasmine/jasmine.d.ts": {
       "commit": "055b3172e8eb374a75826710c4d08677872620d3"
@@ -72,6 +72,9 @@
     "selenium-webdriver/selenium-webdriver.d.ts": {
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
+    "touch-events/touch-events.d.ts": {
+      "commit": "055b3172e8eb374a75826710c4d08677872620d3"
+    },
     "zone/zone.d.ts": {
       "commit": "055b3172e8eb374a75826710c4d08677872620d3"
     }
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 1d22a7e60f..8bcfd28c51 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -8712,7 +8712,7 @@
     },
     "typescript": {
       "version": "1.5.0",
-      "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta"
+      "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f8eb37bde0..6f748db0da 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -13443,8 +13443,8 @@
     },
     "typescript": {
       "version": "1.5.0",
-      "from": "git://github.com/mhegazy/TypeScript.git#v1.5-beta",
-      "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta"
+      "from": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
+      "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/package.json b/package.json
index 0951fc1779..ac119d3707 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "through2": "^0.6.1",
     "ts2dart": "^0.3.0",
     "tsd": "^0.5.7",
-    "typescript": "mhegazy/TypeScript#v1.5-beta",
+    "typescript": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
     "vinyl": "^0.4.6",
     "walk-sync": "^0.1.3",
     "xtend": "^4.0.0",