Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

975c7074

Commit 975c7074 authored 4 years ago by Le Van Truong

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into revert-883077ef

parents e270fc30 67d9f1c5

No related branches found

No related tags found

2 merge requests!387Fix Zigbee generated CCode and add runToNextBreakpointMaxTrans,!386Fix Zigbee generated CCode and add runToNextBreakpointMaxTrans

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

build.txt 1 addition, 1 deletion

build.txt
modeling/AVATAR/CoffeeMachine_Avatar.xml 265 additions, 265 deletions

modeling/AVATAR/CoffeeMachine_Avatar.xml
src/main/java/avatartranslator/AvatarTerm.java 17 additions, 5 deletions

src/main/java/avatartranslator/AvatarTerm.java
src/main/java/avatartranslator/AvatarTransition.java 4 additions, 3 deletions

src/main/java/avatartranslator/AvatarTransition.java
src/main/java/ui/AvatarDesignPanelTranslator.java 10 additions, 4 deletions

src/main/java/ui/AvatarDesignPanelTranslator.java
src/main/java/ui/util/DefaultText.java 2 additions, 2 deletions

src/main/java/ui/util/DefaultText.java

with 299 additions and 280 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