Merge branch 'master' of git@gitlab.enst.fr:mbe-tools/TTool.git
Conflicts: src/ui/MainGUI.java
No related branches found
No related tags found
Showing
- bin/config.xml 1 addition, 1 deletionbin/config.xml
- build.txt 1 addition, 1 deletionbuild.txt
- modeling/DIPLODOCUS/ZigBeeDEMO.xml 2642 additions, 2511 deletionsmodeling/DIPLODOCUS/ZigBeeDEMO.xml
- src/ui/ActionPerformer.java 3 additions, 1 deletionsrc/ui/ActionPerformer.java
- src/ui/ConfigurationTTool.java 21 additions, 0 deletionssrc/ui/ConfigurationTTool.java
- src/ui/DefaultText.java 2 additions, 2 deletionssrc/ui/DefaultText.java
- src/ui/JMenuBarTurtle.java 2 additions, 0 deletionssrc/ui/JMenuBarTurtle.java
- src/ui/MainGUI.java 7929 additions, 7909 deletionssrc/ui/MainGUI.java
- src/ui/ModeManager.java 1 addition, 0 deletionssrc/ui/ModeManager.java
- src/ui/TDiagramPanel.java 228 additions, 228 deletionssrc/ui/TDiagramPanel.java
- src/ui/TGUIAction.java 4 additions, 2 deletionssrc/ui/TGUIAction.java
- src/ui/networkmodelloader/JDialogLoadingNetworkModel.java 214 additions, 0 deletionssrc/ui/networkmodelloader/JDialogLoadingNetworkModel.java
- src/ui/networkmodelloader/NetworkModel.java 64 additions, 0 deletionssrc/ui/networkmodelloader/NetworkModel.java
- src/ui/networkmodelloader/NetworkModelPanel.java 61 additions, 0 deletionssrc/ui/networkmodelloader/NetworkModelPanel.java
- src/ui/networkmodelloader/NetworkModelType.java 53 additions, 0 deletionssrc/ui/networkmodelloader/NetworkModelType.java
Loading
Please register or sign in to comment