3 Commits

Author	SHA1	Message	Date
Jocelyn Fiat	e65c2da528	Merge branch 'master' of https://github.com/eiffelhub/json	2012-11-15 16:29:02 +01:00
Jocelyn Fiat	40e524337e	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	2012-08-24 02:40:54 -07:00
Jocelyn Fiat	e8fa284c79	Replaced git submodule by subtree merged in contrib/library/text/parser/json	2012-06-20 09:52:07 +02:00