Merge branch 'robbert/iprod' into 'master' (86304d73) · 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

86304d73

Commit 86304d73 authored 7 years ago by Robbert Krebbers

Downloads
- Plain Diff

Merge branch 'robbert/iprod' into 'master'

Get rid of `ofe_fun`, it was just a non-dependently typed version of `iprod`

See merge request FP/iris-coq!88

parents 833f7c15 2ed3de6b

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

_CoqProject 1 addition, 1 deletion

_CoqProject
theories/algebra/cmra.v 101 additions, 0 deletions

theories/algebra/cmra.v
theories/algebra/functions.v 153 additions, 0 deletions

theories/algebra/functions.v
theories/algebra/iprod.v 0 additions, 345 deletions

theories/algebra/iprod.v
theories/algebra/ofe.v 100 additions, 67 deletions

theories/algebra/ofe.v
theories/base_logic/lib/iprop.v 4 additions, 4 deletions

theories/base_logic/lib/iprop.v
theories/base_logic/lib/own.v 8 additions, 8 deletions

theories/base_logic/lib/own.v
theories/base_logic/lib/saved_prop.v 3 additions, 4 deletions

theories/base_logic/lib/saved_prop.v
theories/base_logic/primitive.v 7 additions, 3 deletions

theories/base_logic/primitive.v

with 377 additions and 432 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