Merge remote-tracking branch 'origin/master' into revert-883077ef
Showing
- build.txt 1 addition, 1 deletionbuild.txt
- modeling/AVATAR/CoffeeMachine_Avatar.xml 265 additions, 265 deletionsmodeling/AVATAR/CoffeeMachine_Avatar.xml
- modeling/AVATAR/PressureController.xml 921 additions, 921 deletionsmodeling/AVATAR/PressureController.xml
- modeling/AVATAR/testMC.xml 27 additions, 0 deletionsmodeling/AVATAR/testMC.xml
- modeling/DIPLODOCUS/SmartCardProtocol.xml 578 additions, 578 deletionsmodeling/DIPLODOCUS/SmartCardProtocol.xml
- src/main/java/ui/TGHelpButton.java 2 additions, 1 deletionsrc/main/java/ui/TGHelpButton.java
- src/main/java/ui/avatarbd/AvatarBDSafetyPragma.java 2 additions, 1 deletionsrc/main/java/ui/avatarbd/AvatarBDSafetyPragma.java
- src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java 11 additions, 9 deletions...va/ui/avatarmethodology/AvatarMethodologyDiagramName.java
- src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java 2 additions, 1 deletion.../avatarmethodology/AvatarMethodologyDiagramReference.java
- src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java 3 additions, 4 deletions...plodocusmethodology/DiplodocusMethodologyDiagramName.java
- src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java 4 additions, 0 deletions...cusmethodology/DiplodocusMethodologyDiagramReference.java
- src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java 1 addition, 1 deletion...i/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
- src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java 1 addition, 0 deletions...mlsecmethodology/SysmlsecMethodologyDiagramReference.java
- src/main/java/ui/util/DefaultText.java 2 additions, 2 deletionssrc/main/java/ui/util/DefaultText.java
- src/main/java/ui/window/JDialogAvatarModelChecker.java 2 additions, 0 deletionssrc/main/java/ui/window/JDialogAvatarModelChecker.java
- src/main/java/ui/window/JDialogSafetyPragma.java 33 additions, 2 deletionssrc/main/java/ui/window/JDialogSafetyPragma.java
- src/main/java/ui/window/JDialogTGComponentHelp.java 1 addition, 1 deletionsrc/main/java/ui/window/JDialogTGComponentHelp.java
- src/main/resources/help/README 5 additions, 1 deletionsrc/main/resources/help/README
- src/main/resources/help/avatar.html 3 additions, 3 deletionssrc/main/resources/help/avatar.html
- src/main/resources/help/avatar.md 3 additions, 3 deletionssrc/main/resources/help/avatar.md
Loading
Please register or sign in to comment