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

cf44ca8b

Commit cf44ca8b authored 7 years ago by Ralf Jung

Downloads
- Plain Diff

Merge branch 'robbert/issue_154' into 'gen_proofmode'

Bring back side-conditionals for `iMod`

See merge request FP/iris-coq!113

parents c54e1692 10ce5481

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

theories/bi/counter_examples.v 3 additions, 3 deletions

theories/bi/counter_examples.v
theories/program_logic/total_weakestpre.v 3 additions, 3 deletions

theories/program_logic/total_weakestpre.v
theories/program_logic/weakestpre.v 3 additions, 3 deletions

theories/program_logic/weakestpre.v
theories/proofmode/class_instances.v 15 additions, 25 deletions

theories/proofmode/class_instances.v
theories/proofmode/classes.v 7 additions, 9 deletions

theories/proofmode/classes.v
theories/proofmode/coq_tactics.v 5 additions, 4 deletions

theories/proofmode/coq_tactics.v
theories/proofmode/monpred.v 25 additions, 25 deletions

theories/proofmode/monpred.v
theories/proofmode/tactics.v 2 additions, 1 deletion

theories/proofmode/tactics.v

with 63 additions and 73 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