Merge branch 'master' of git.fp.mpi-sws.org:nowbook (ede9a750) · Commits · Tej Chajed / iris · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

iris
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

ede9a750

Commit ede9a750 authored 10 years ago by Ralf Jung

Downloads
- Plain Diff

Merge branch 'master' of git.fp.mpi-sws.org:nowbook

Conflicts:
	coq-ho/iris_plog.v
	coq-ho/lib/ModuRes/BI.v

parents 8a5aef49 5c33aedd

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

iris_core.v 16 additions, 15 deletions

iris_core.v
iris_derived_rules.v 0 additions, 2 deletions

iris_derived_rules.v
iris_ht_rules.v 10 additions, 16 deletions

iris_ht_rules.v
iris_meta.v 18 additions, 23 deletions

iris_meta.v
iris_plog.v 41 additions, 51 deletions

iris_plog.v
iris_vs_rules.v 31 additions, 35 deletions

iris_vs_rules.v
lib/ModuRes/BI.v 23 additions, 27 deletions

lib/ModuRes/BI.v
lib/ModuRes/RA.v 4 additions, 102 deletions

lib/ModuRes/RA.v
world_prop.v 1 addition, 3 deletions

world_prop.v
world_prop_recdom.v 1 addition, 3 deletions

world_prop_recdom.v

with 145 additions and 277 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