From ffe87ddf4112812ad397aee883f0a6428716b717 Mon Sep 17 00:00:00 2001
From: Boris Yankov <borisyankov@gmail.com>
Date: Wed, 7 Aug 2013 18:52:06 +0300
Subject: [PATCH] Merge Updates to Knockout and Mocha

---
 knockout/knockout.d.ts | 1 +
 mocha/mocha.d.ts       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index 3a82c329dc..e5bd0e3a33 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -394,6 +394,7 @@ interface KnockoutStatic {
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
     toJS(viewModel: any): any;
     isObservable(instance: any): boolean;
+    isWriteableObservable(instance: any): boolean;
     isComputed(instance: any): boolean;
     dataFor(node: any): any;
     removeNode(node: Element);
diff --git a/mocha/mocha.d.ts b/mocha/mocha.d.ts
index 50fb3fcc47..f9d8040b12 100644
--- a/mocha/mocha.d.ts
+++ b/mocha/mocha.d.ts
@@ -12,11 +12,11 @@ declare var describe : {
 
 declare var it: {
     (expectation: string, assertion?: () => void): void;
-    (expectation: string, assertion?: (done: (failReason?) => void) => void): void;
+    (expectation: string, assertion?: (done: (error?: Error) => void) => void): void;
     only(expectation: string, assertion?: () => void): void;
-	only(expectation: string, assertion?: (done: (failReason?) => void) => void): void;
+    only(expectation: string, assertion?: (done: (error?: Error) => void) => void): void;
     skip(expectation: string, assertion?: () => void): void;
-	skip(expectation: string, assertion?: (done: (failReason?) => void) => void): void;
+    skip(expectation: string, assertion?: (done: (error?: Error) => void) => void): void;
     timeout(ms: number);
 };