Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

21419737

Commit 21419737 authored 9 years ago by Ralf Jung

Downloads
- Plain Diff

Merge branch 'master' of gitlab.mpi-sws.org:FP/iris-coq

parents 567ff5de 4734d7bf

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

algebra/auth.v 15 additions, 4 deletions

algebra/auth.v
algebra/cmra.v 33 additions, 8 deletions

algebra/cmra.v
algebra/cofe.v 16 additions, 12 deletions

algebra/cofe.v
algebra/dec_agree.v 11 additions, 22 deletions

algebra/dec_agree.v
algebra/dra.v 7 additions, 14 deletions

algebra/dra.v
algebra/excl.v 7 additions, 5 deletions

algebra/excl.v
algebra/fin_maps.v 4 additions, 6 deletions

algebra/fin_maps.v
algebra/option.v 5 additions, 2 deletions

algebra/option.v
algebra/sts.v 3 additions, 0 deletions

algebra/sts.v
algebra/upred.v 16 additions, 14 deletions

algebra/upred.v
heap_lang/heap.v 5 additions, 5 deletions

heap_lang/heap.v
program_logic/auth.v 17 additions, 19 deletions

program_logic/auth.v
program_logic/sts.v 2 additions, 2 deletions

program_logic/sts.v

with 141 additions and 113 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