• Guillaume Melquiond's avatar
    Merge branch 'master' into new_system · 57d1a4be
    Guillaume Melquiond authored
    Conflicts:
    	Version
    	doc/manual.tex
    	examples/add_list/why3session.xml
    	examples/algo63/why3session.xml
    	examples/algo64/why3session.xml
    	examples/algo65/why3session.xml
    	examples/all_distinct/why3session.xml
    	examples/arm/why3session.xml
    	examples/assigning_meanings_to_programs/why3session.xml
    	examples/binary_multiplication.mlw
    	examples/binary_multiplication/why3session.xml
    	examples/binary_multiplication/why3shapes.gz
    	examples/binary_search/why3session.xml
    	examples/binary_sqrt/why3session.xml
    	examples/bitcount/why3session.xml
    	examples/bitvector_examples/why3session.xml
    	examples/bitwalker/why3session.xml
    	examples/braun_trees/why3session.xml
    	examples/bresenham/why3session.xml
    	examples/bubble_sort/why3session.xml
    	examples/coincidence_count/why3session.xml
    	examples/conjugate/why3session.xml
    	examples/counting_sort/why3session.xml
    	examples/cursor/why3session.xml
    	examples/cursor/why3shapes.gz
    	examples/defunctionalization/why3session.xml
    	examples/dfa_example/why3session.xml
    	examples/dfs/why3session.xml
    	examples/fibonacci/why3session.xml
    	examples/finite_tarski/why3session.xml
    	examples/flag2/why3session.xml
    	examples/gcd/why3session.xml
    	examples/gcd_bezout/why3session.xml
    	examples/gcd_bezout/why3shapes.gz
    	examples/hackers-delight/why3session.xml
    	examples/linked_list_rev/why3session.xml
    	examples/mccarthy.mlw
    	examples/mccarthy/why3session.xml
    	examples/mccarthy/why3shapes.gz
    	examples/patience/why3session.xml
    	examples/power/why3session.xml
    	examples/power/why3shapes.gz
    	examples/queens_bv/why3session.xml
    	examples/register_allocation/why3session.xml
    	examples/schorr_waite/why3session.xml
    	examples/schorr_waite/why3shapes.gz
    	examples/sudoku/why3session.xml
    	examples/verifythis_fm2012_treedel/why3session.xml
    	modules/array.mlw
    	share/emacs/why3.el
    	share/latex/why3lang.sty
    	src/core/pretty.ml
    	src/core/task.mli
    	src/driver/autodetection.ml
    	src/printer/alt_ergo.ml
    	src/tools/why3prove.ml
    	src/transform/eval_match.ml
    	src/transform/prepare_for_counterexmp.ml
    	src/transform/split_goal.ml
    	src/util/strings.mli
    	src/why3session/why3session_html.ml
    57d1a4be
Makefile.in 66.5 KB