commit to allow merge of master

This commit is contained in:
alisdair sullivan 2010-08-06 17:59:44 -07:00
commit 83243c22f4
4 changed files with 245 additions and 301 deletions

View file

@ -81,7 +81,7 @@ term_to_json(JSON) ->
term_to_json(JSON, []).
term_to_json(JSON, Opts) ->
jsx_encoder:term_to_json(JSON, Opts).
jsx_eep0018:term_to_json(JSON, Opts).
-spec json_to_term(JSON::binary()) -> json().
@ -256,4 +256,4 @@ parse_test([{Key, Path}|Rest], Test) when is_list(Path) ->
parse_test(Rest, [{Key, Path}] ++ Test)
end.
-endif.
-endif.