Skip to content
Snippets Groups Projects
Commit f0bff3e5 authored by Pierre Loic Garoche's avatar Pierre Loic Garoche
Browse files

Merge branch 'salsa' into merge_salsa_horn_2 

Postponed conflicts to be solved
Conflicts:
	src/_tags
	src/backends/Horn/horn_backend.ml
	src/machine_code.ml
	src/main_lustre_compiler.ml
	src/myocamlbuild.ml.in
	src/optimize_machine.ml
parents a7e70823 bdcbb2a1
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1239 additions and 6264 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment