search

jeannin / zelus

A synchronous language with ODEs
http://zelus.di.ens.fr
Other
0 stars 4 forks source link

Updating to Zelus 2.2 #10

Closed nskh closed 2 years ago

nskh commented 2 years ago

Rebased on top of Zelus 2.2 commit

I ran git pull upstream 56febdfc91bb35eb5cf5c1aa6d04119b048d0a28 --rebase and I had to fix one merge conflict in compilers/dune to get this to rebase cleanly

Closes #9.

nskh commented 2 years ago

@jlvargasme it looks like this branch has the conflicts fixed - is it also up to date with your latest changes to https://github.com/jeannin/zelus/tree/dependent_types?

@jchen-cs this may be ready for review and testing, if so

jlvargasme commented 2 years ago

@jlvargasme it looks like this branch has the conflicts fixed - is it also up to date with your latest changes to https://github.com/jeannin/zelus/tree/dependent_types?

@jchen-cs this may be ready for review and testing, if so

Yes, the latest changes from dependent_types are present in this request.