Skip to content
Snippets Groups Projects

[3924] Fix small bugs in fx diagram editor

Merged [3924] Fix small bugs in fx diagram editor
3924 into master
Merged Ulrich Schöpp requested to merge 3924 into master
Viewing commit 121b97a9
Prev
Show latest version
3 files
+ 3
− 7
Compare changes
  • Side-by-side
  • Inline
Files
3
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
+ 1
− 5
@@ -3,11 +3,7 @@ CurvedLinkLayoutedContentAnchorangeController.java 6d2b64c3d6c813ac001b1500ed052
EObjectDiagramController.java 2b253941592ee25ead95223470f983f23ef9776f GREEN
EObjectEllipticResizableContentControllerBase.java 7c862a03b97d2f2cfdcc2fcee7434de2e1e257d2 GREEN
EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
<<<<<<< HEAD
EObjectRectangularResizableContentControllerBase.java f4a967591a60fadb20550ec3eaabccf240c9ec0d YELLOW
=======
EObjectRectangularResizableContentControllerBase.java 28a17bf87f6a7222d927bc1c6b80967cb14b5f03 GREEN
>>>>>>> refs/heads/master
EObjectRectangularResizableContentControllerBase.java e73cda8f54318f8b785a208215d9e31eaa46eff7 GREEN
KernelServiceBasedModelChangeProviderBase.java 8d1f8ef79ecd383ff74e5a2bbcf24345aabe70af GREEN
LayoutModelChangeProvider.java b5449d02eaf39086909720c43e21bd061005fc9e GREEN
LayoutedContentAnchorageController.java 9fc513a7404277514c730f7702d45588f2d81878 GREEN