Skip to content
This repository has been archived by the owner on Jul 19, 2019. It is now read-only.

Commit

Permalink
Merge branch 'feature/kernelSplit' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	de.prob2.kernel/src/main/java/de/prob/Main.java
	de.prob2.kernel/src/main/java/de/prob/web/views/BConsole.java
	de.prob2.kernel/src/main/java/de/prob/web/views/CurrentAnimations.java
	de.prob2.kernel/src/main/java/de/prob/web/views/Events.java
	de.prob2.kernel/src/main/java/de/prob/web/views/ModelCheckingUI.java
	de.prob2.kernel/src/main/java/de/prob/web/views/StateInspector.java
	de.prob2.kernel/src/main/java/de/prob/web/views/ValueOverTime.java
	de.prob2.kernel/src/main/java/de/prob/web/worksheet/B.java
	de.prob2.kernel/src/main/java/de/prob/web/worksheet/LoadModel.java
  • Loading branch information
@joyheron
joyheron committed Jul 2, 2015
2 parents 0f26dcf + acdfeed commit 6e1ff64
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 6e1ff64

Please sign in to comment.