Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TTool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

2a3e9100

Commit 2a3e9100 authored 7 years ago by Daniela Genius

Downloads
- Plain Diff

fixed

Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool

Conflicts:
	src/main/java/ui/TGUIAction.java

parents 11c7fc76 2a0c7505

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

readme 2 additions, 0 deletions

readme
src/main/java/heterogeneoustranslator/systemCAMStranslator/CAMSSignal.java 2 additions, 0 deletions

...erogeneoustranslator/systemCAMStranslator/CAMSSignal.java
src/main/java/ui/ActionPerformer.java 9 additions, 0 deletions

src/main/java/ui/ActionPerformer.java
src/main/java/ui/GTMLModeling.java 30 additions, 0 deletions

src/main/java/ui/GTMLModeling.java
src/main/java/ui/GTURTLEModeling.java 116 additions, 0 deletions

src/main/java/ui/GTURTLEModeling.java
src/main/java/ui/MainGUI.java 97 additions, 3 deletions

src/main/java/ui/MainGUI.java
src/main/java/ui/TAttribute.java 68 additions, 25 deletions

src/main/java/ui/TAttribute.java
src/main/java/ui/TDiagramPanel.java 65 additions, 0 deletions

src/main/java/ui/TDiagramPanel.java
src/main/java/ui/TGComponentManager.java 29 additions, 0 deletions

src/main/java/ui/TGComponentManager.java
src/main/java/ui/TGUIAction.java 1259 additions, 0 deletions

src/main/java/ui/TGUIAction.java
src/main/java/ui/het/CAMSBlock.java 52 additions, 12 deletions

src/main/java/ui/het/CAMSBlock.java
src/main/java/ui/het/CAMSConnectingPoint.java 39 additions, 15 deletions

src/main/java/ui/het/CAMSConnectingPoint.java
src/main/java/ui/window/JDialogCAMSBlocks.java 7 additions, 1 deletion

src/main/java/ui/window/JDialogCAMSBlocks.java

with 1775 additions and 56 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 sign in to comment