Skip to content
Snippets Groups Projects
Commit 151a5eec authored by Ulrich Schöpp's avatar Ulrich Schöpp
Browse files

Merge branch 'master' into 3924


Conflicts:
	org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/rectangular/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/visual/elliptic/.ratings


Signed-off-by: default avatarUlrich Schöpp <schoepp@fortiss.org>
parents 9aff21b6 7de36295
No related branches found
No related tags found
1 merge request!89[3924] Fix small bugs in fx diagram editor
This commit is part of merge request !89. Comments created here will be created in the context of that merge request.
Showing
with 878 additions and 95 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 to comment