Moemoea Fierin
authored
31-zoom-on-all-diagrams Conflicts: src/.classpath src/main/java/tmltranslator/HwBridge.java src/main/java/tmltranslator/HwCPU.java src/main/java/tmltranslator/HwFPGA.java src/main/java/tmltranslator/HwRouter.java src/main/java/ui/SecurityGeneration.java src/main/java/ui/avatarbd/AvatarBDBlock.java src/main/java/ui/avatarcd/AvatarCDBlock.java src/main/java/ui/avatardd/ADDBlockArtifact.java src/main/java/ui/avatardd/ADDBridgeNode.java src/main/java/ui/avatardd/ADDBusNode.java src/main/java/ui/avatardd/ADDChannelArtifact.java src/main/java/ui/avatardd/ADDClusterNode.java src/main/java/ui/tmlcompd/TMLCJoin.java src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java src/main/java/ui/tmlcompd/TMLCPrimitivePort.java src/main/java/ui/tmldd/TMLArchiArtifact.java src/main/java/ui/tmldd/TMLArchiBUSNode.java src/main/java/ui/tmldd/TMLArchiCPNode.java src/main/java/ui/tmldd/TMLArchiCPUNode.java src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java src/main/java/ui/tmldd/TMLArchiFPGANode.java src/main/java/ui/tmldd/TMLArchiHWANode.java src/main/java/ui/tmldd/TMLArchiPortArtifact.java src/main/java/ui/tmldd/TMLArchiRouterNode.java src/main/java/ui/ucd/TGConnectingPointActorUCD.java src/main/java/ui/ucd/TGConnectingPointUCD.java src/main/java/ui/ucd/UCDActor.java src/main/java/ui/ucd/UCDActorBox.java