Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frama-c
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

22438114

Commit 22438114 authored 7 months ago by Loïc Correnson Committed by Virgile Prevosto 6 months ago

Downloads
- Patches
- Plain Diff

[modules] fixed merge of sub-modules

parent eb51c616

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/kernel_internals/typing/mergecil.ml 43 additions, 52 deletions

src/kernel_internals/typing/mergecil.ml
src/kernel_services/ast_data/property_status.ml 1 addition, 1 deletion

src/kernel_services/ast_data/property_status.ml
src/kernel_services/ast_queries/file.ml 1 addition, 0 deletions

src/kernel_services/ast_queries/file.ml
tests/spec/oracle/submodule.res.oracle 16 additions, 0 deletions

tests/spec/oracle/submodule.res.oracle
tests/spec/submodule.i 9 additions, 0 deletions

tests/spec/submodule.i

with 70 additions and 53 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