Skip to content
Snippets Groups Projects
Commit 3caa8145 authored by Dominique Blouin's avatar Dominique Blouin
Browse files

Merge branch '31-zoom-on-all-diagrams' of

git@gitlab.enst.fr:mbe-tools/TTool.git into 31-zoom-on-all-diagrams

Conflicts:
	src/main/java/ui/TGScalableComponent.java
	src/main/java/ui/ad/TADChoice.java
	src/main/java/ui/ad/TADForLoop.java
	src/main/java/ui/tmlad/TMLADDecrypt.java
	src/main/java/ui/tmlad/TMLADDelay.java
	src/main/java/ui/tmlad/TMLADDelayInterval.java
	src/main/java/ui/tmlad/TMLADEncrypt.java
	src/main/java/ui/tmlad/TMLADExecC.java
	src/main/java/ui/tmlad/TMLADExecCInterval.java
	src/main/java/ui/tmlad/TMLADExecI.java
	src/main/java/ui/tmlad/TMLADExecIInterval.java
	src/main/java/ui/tmlad/TMLADForLoop.java
	src/main/java/ui/tmlad/TMLADNotifiedEvent.java
	src/main/java/ui/tmlad/TMLADRandom.java
	src/main/java/ui/tmlad/TMLADReadChannel.java
	src/main/java/ui/tmlad/TMLADSendEvent.java
	src/main/java/ui/tmlad/TMLADSendRequest.java
	src/main/java/ui/tmlad/TMLADStartState.java
	src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
parents 329d7354 a97275c8
No related branches found
No related tags found
1 merge request!287Resolve "Zoom on all diagrams"
Showing
No files found.
with 0 additions and 0 deletions
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