From 913de29307f726ff43d583014622dc6cc8a7d015 Mon Sep 17 00:00:00 2001
From: JesperSchultz <schultz.dk@server.fake>
Date: Tue, 23 Apr 2013 14:39:00 +0200
Subject: [PATCH] fix for fromJSON with options

---
 knockout.mapping/knockout.mapping.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/knockout.mapping/knockout.mapping.d.ts b/knockout.mapping/knockout.mapping.d.ts
index f1489a1e80..69b6ccaffb 100644
--- a/knockout.mapping/knockout.mapping.d.ts
+++ b/knockout.mapping/knockout.mapping.d.ts
@@ -33,6 +33,8 @@ interface KnockoutMapping {
     fromJS(jsObject: any, targetOrOptions: any): any;
     fromJS(jsObject: any, inputOptions: any, target: any): any;
     fromJSON(jsonString: string): any;
+    fromJSON(jsonString: string, targetOrOptions: any): any;
+    fromJSON(jsonString: string, inputOptions: any, target: any): any;
     toJS(rootObject: any, options?: KnockoutMappingOptions): any;
     toJSON(rootObject: any, options?: KnockoutMappingOptions): any;
     defaultOptions(): KnockoutMappingOptions;