Skip to content
Snippets Groups Projects
Commit ba31e728 authored by Daniel Plagge's avatar Daniel Plagge
Browse files

Merge branch 'develop' into feature/theory_plugin

Conflicts:
	de.prob.core/.classpath
	de.prob.core/META-INF/MANIFEST.MF
	de.prob.core/src/de/prob/eventb/translator/internal/EventBTranslator.java
parents 0eaf49d1 fe287ca8
No related branches found
No related tags found
No related merge requests found
Showing
with 1465 additions and 121 deletions
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment