Merge branch 'ike/internal_included' into 'master' (6eb056bb) · Commits · Gaëtan Gilbert / Iris · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Iris
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Service Desk

Snippets Groups Projects

6eb056bb

Commit 6eb056bb authored 1 year ago by Robbert Krebbers

Downloads
- Plain Diff

Merge branch 'ike/internal_included' into 'master'

Add derived ≼ connective on the BI level.

See merge request iris/iris!944

parents 95f3a05f ef07937c

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 5 additions, 1 deletion

CHANGELOG.md
_CoqProject 1 addition, 0 deletions

_CoqProject
iris/algebra/cmra.v 8 additions, 1 deletion

iris/algebra/cmra.v
iris/algebra/csum.v 7 additions, 0 deletions

iris/algebra/csum.v
iris/algebra/dyn_reservation_map.v 2 additions, 1 deletion

iris/algebra/dyn_reservation_map.v
iris/algebra/excl.v 7 additions, 0 deletions

iris/algebra/excl.v
iris/algebra/gmap.v 1 addition, 2 deletions

iris/algebra/gmap.v
iris/algebra/max_prefix_list.v 1 addition, 1 deletion

iris/algebra/max_prefix_list.v
iris/algebra/reservation_map.v 1 addition, 1 deletion

iris/algebra/reservation_map.v
iris/algebra/view.v 5 additions, 5 deletions

iris/algebra/view.v
iris/base_logic/algebra.v 2 additions, 32 deletions

iris/base_logic/algebra.v
iris/bi/internal_eq.v 41 additions, 0 deletions

iris/bi/internal_eq.v
iris/bi/lib/cmra.v 152 additions, 0 deletions

iris/bi/lib/cmra.v

with 233 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment