Merge branch 'master' of https://github.com/eiffelhub/json

Conflicts:
	draft/library/gobo/shared_gobo_ejson.e
	draft/library/kernel/converters/json_converter.e
	draft/library/kernel/converters/json_hash_table_converter.e
	draft/library/kernel/converters/json_linked_list_converter.e
	draft/library/kernel/ejson.e
	draft/library/kernel/shared_ejson.e
	draft/test/autotest/test_suite/json_author_converter.e
	draft/test/autotest/test_suite/json_book_collection_converter.e
	draft/test/autotest/test_suite/json_book_converter.e
	draft/test/autotest/test_suite/test_json_core.e

This commit is contained in:

Jocelyn Fiat

2012-08-24 02:40:54 -07:00

parent 5487b04922 b6464cf5e7

commit 40e524337e

13 changed files with 329 additions and 80 deletions

contrib/library/text/parser/json/library/gobo/shared_gobo_ejson.e

+1 -1

View File

@@ -29,4 +29,4 @@ feature
             Result.add_converter (jhtc)
         end
 end -- class SHARED_GOBO_EJSON
 end -- class SHARED_GOBO_EJSON