Merge pull request #230 from tedsuo/rewrite

Rewrite
josephg · Aug 20, 2013 · 5762a8f · 5762a8f
2 parents bc1279c + c8d0c8b
commit 5762a8f
Show file tree

Hide file tree

Showing 6 changed files with 1,075 additions and 191 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,8 @@ CLIENT = \
 BUNDLED_TYPES = \
 	webclient/text.js \
 	lib/types/text-api.js \
-	webclient/json0.js
+	webclient/json0.js \
+	lib/types/json-api.js 
 
 # Disabled: lib/types/json-api.coffee
 

diff --git a/lib/types/json-api.coffee b/lib/types/json-api.coffee