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
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 487 additions and 842 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment