Skip to content
Snippets Groups Projects
Commit bb851ce8 authored by George Pîrlea's avatar George Pîrlea
Browse files

Merge branch 'master' into gpirlea/pinning

This branch is in a badly broken state. Even before the
merge, the build did no go through, as we did not finish
propagating the change to places in the semantic type
system to all files.

Nonetheless, the changes from master have now been merged,
with the exception of the following files:

theories/typing/lib/cell.v
theories/typing/soundness.v

(which require fixing other files before they can be compiled)

For these two files, the merge conflict has been commented out
and left in the file.
parents aa93b381 c36ae2bd
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment