Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

157251c2

Commit 157251c2 authored 8 months ago by Alan Birchler De Allende

Downloads
- Plain Diff

Merge branch 'master' into alan_attack_tree_gen

parents 8a8e4958 0dd75f66

No related branches found

No related tags found

1 merge request!502Merging newest updates to master branch

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

build.txt 1 addition, 1 deletion

build.txt
scripts/Dockerfile 18 additions, 4 deletions

scripts/Dockerfile
scripts/cidoc.md 38 additions, 1 deletion

scripts/cidoc.md
src/main/java/avatartranslator/AvatarAttribute.java 1 addition, 4 deletions

src/main/java/avatartranslator/AvatarAttribute.java
src/main/java/avatartranslator/AvatarSyntaxChecker.java 7 additions, 1 deletion

src/main/java/avatartranslator/AvatarSyntaxChecker.java
src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java 2 additions, 2 deletions

...va/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
src/main/java/ui/util/DefaultText.java 2 additions, 2 deletions

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

with 69 additions and 15 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