Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e40adede

Commit e40adede authored 3 months ago by Sophie Coudert

Downloads
- Plain Diff

Merge remote-tracking branch 'origin' into avatarSysML_04_2024

parents 0e8a25f7 40da73ae

No related branches found

No related tags found

2 merge requests!508Avatar sys ml 04 2024,!507Avatar sys ml 04 2024

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

modeling/AVATAR/CoffeeMachine_Avatar.xml 1923 additions, 1914 deletions

modeling/AVATAR/CoffeeMachine_Avatar.xml
modeling/modelsForTestingTTool/testavatar.xml 9120 additions, 5922 deletions

modeling/modelsForTestingTTool/testavatar.xml
src/main/java/avatartranslator/AvatarNote.java 9 additions, 4 deletions

src/main/java/avatartranslator/AvatarNote.java
src/main/java/ui/AvatarDesignPanelTranslator.java 2 additions, 0 deletions

src/main/java/ui/AvatarDesignPanelTranslator.java

with 11054 additions and 7840 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