• MARCHE Claude's avatar
    Merge branch 'master' into new_system · e5c887c7
    MARCHE Claude authored
    # Conflicts:
    #	Makefile.in
    #	Version
    #	examples/avl/priority_queue/why3session.xml
    #	examples/avl/priority_queue/why3shapes.gz
    #	examples/avl/tables/why3session.xml
    #	examples/avl/tables/why3shapes.gz
    #	examples/binomial_heap/why3session.xml
    #	examples/binomial_heap/why3shapes.gz
    #	examples/bitcount/why3session.xml
    #	examples/bitcount/why3shapes.gz
    #	examples/counting_sort/why3session.xml
    #	examples/counting_sort/why3shapes.gz
    #	examples/dijkstra/why3shapes.gz
    #	examples/double_wp/compiler/why3session.xml
    #	examples/double_wp/compiler/why3shapes.gz
    #	examples/double_wp/specs/why3session.xml
    #	examples/double_wp/specs/why3shapes.gz
    #	examples/dyck/why3session.xml
    #	examples/dyck/why3shapes.gz
    #	examples/euler001/why3session.xml
    #	examples/euler001/why3shapes.gz
    #	examples/euler011/why3session.xml
    #	examples/euler011/why3shapes.gz
    #	examples/finger_trees/why3session.xml
    #	examples/finger_trees/why3shapes.gz
    #	examples/hashtbl_impl/why3shapes.gz
    #	examples/inverse_in_place/why3session.xml
    #	examples/inverse_in_place/why3shapes.gz
    #	examples/knuth_prime_numbers/why3session.xml
    #	examples/knuth_prime_numbers/why3shapes.gz
    #	examples/koda_ruskey/why3session.xml
    #	examples/koda_ruskey/why3shapes.gz
    #	examples/linear_probing/why3session.xml
    #	examples/linear_probing/why3shapes.gz
    #	examples/linked_list_rev/why3session.xml
    #	examples/linked_list_rev/why3shapes.gz
    #	examples/logic/triangle_inequality/why3session.xml
    #	examples/logic/triangle_inequality/why3shapes.gz
    #	examples/max_matrix/why3session.xml
    #	examples/max_matrix/why3shapes.gz
    #	examples/maximum_subarray/why3session.xml
    #	examples/maximum_subarray/why3shapes.gz
    #	examples/mergesort_list/why3session.xml
    #	examples/mergesort_list/why3shapes.gz
    #	examples/power/why3session.xml
    #	examples/power/why3shapes.gz
    #	examples/quicksort/why3session.xml
    #	examples/quicksort/why3shapes.gz
    #	examples/register_allocation/why3session.xml
    #	examples/register_allocation/why3shapes.gz
    #	examples/ropes/why3session.xml
    #	examples/ropes/why3shapes.gz
    #	examples/schorr_waite/why3session.xml
    #	examples/schorr_waite/why3shapes.gz
    #	examples/schorr_waite_via_recursion/why3session.xml
    #	examples/schorr_waite_via_recursion/why3shapes.gz
    #	examples/stdlib/array/why3session.xml
    #	examples/tests-provers/bv/why3session.xml
    #	examples/tests-provers/div/why3session.xml
    #	examples/to_port/dijkstra.mlw
    #	examples/to_port/dijkstra/why3session.xml
    #	examples/to_port/hashtbl_impl/why3session.xml
    #	examples/verifythis_2015_relaxed_prefix/why3session.xml
    #	examples/verifythis_2015_relaxed_prefix/why3shapes.gz
    #	examples/verifythis_2016_tree_traversal/why3session.xml
    #	examples/verifythis_2016_tree_traversal/why3shapes.gz
    #	examples/vstte12_combinators/why3session.xml
    #	examples/vstte12_combinators/why3shapes.gz
    #	examples/vstte12_ring_buffer/why3session.xml
    #	examples/vstte12_ring_buffer/why3shapes.gz
    #	examples/vstte12_two_way_sort/why3session.xml
    #	examples/vstte12_two_way_sort/why3shapes.gz
    #	src/core/ident.ml
    #	src/core/pretty.ml
    #	src/core/pretty.mli
    #	src/core/trans.ml
    #	src/ide/gmain.ml
    #	src/parser/lexer.mli
    #	src/parser/lexer.mll
    #	src/parser/parser.mly
    #	src/parser/typing.ml
    #	src/parser/typing.mli
    #	src/session/session.ml
    #	src/session/session_scheduler.ml
    #	src/session/session_scheduler.mli
    #	src/tools/why3replay.ml
    #	src/transform/introduction.ml
    #	src/util/pp.mli
    #	src/util/strings.ml
    #	src/why3session/why3session_html.ml
    #	src/whyml/mlw_interp.ml
    e5c887c7
Version 17 Bytes