Project

General

Profile

« Previous | Next » 

Revision f0bff3e5

IDf0bff3e5e9f85a0b81ce1d01c6f29b4530134093
Parent a7e70823, bdcbb2a1
Child ca88e660

Added by Pierre-Loïc Garoche over 3 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted