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

..

ise_library

Replaced git submodule by subtree merged in contrib/ise_library/cURL

2012-06-20 09:55:34 +02:00

library

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

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

build.eant

Added geant scripts to compile EWF

2012-05-03 18:29:46 +02:00