Commit b4a79d85 authored 8 years ago by Ludovic Apvrille

resolving confliect

parent eb2cbc62

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Makefile 7 additions, 1 deletion

Makefile
preinstallTTool/TTool_Linux/TTool/bin/launcher.jar 0 additions, 0 deletions

preinstallTTool/TTool_Linux/TTool/bin/launcher.jar
preinstallTTool/TTool_Linux/TTool/bin/rundse.jar 0 additions, 0 deletions

preinstallTTool/TTool_Linux/TTool/bin/rundse.jar
preinstallTTool/TTool_Linux/TTool/bin/tiftranslator.jar 0 additions, 0 deletions

preinstallTTool/TTool_Linux/TTool/bin/tiftranslator.jar
preinstallTTool/TTool_Linux/TTool/bin/tmltranslator.jar 0 additions, 0 deletions

preinstallTTool/TTool_Linux/TTool/bin/tmltranslator.jar
preinstallTTool/TTool_Linux/TTool/bin/ttool.jar 0 additions, 0 deletions

preinstallTTool/TTool_Linux/TTool/bin/ttool.jar
preinstallTTool/TTool_Linux/TTool/modeling/CoffeeMachine_Avatar.xml 1822 additions, 1752 deletions

...TTool/TTool_Linux/TTool/modeling/CoffeeMachine_Avatar.xml
preinstallTTool/TTool_Linux/TTool/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml 2030 additions, 1910 deletions

...ool/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml
preinstallTTool/TTool_Linux/TTool/modeling/Network_Avatar.xml 3298 additions, 606 deletions

...nstallTTool/TTool_Linux/TTool/modeling/Network_Avatar.xml
preinstallTTool/TTool_Linux/TTool/modeling/SmartCardProtocol.xml 2449 additions, 2445 deletions

...allTTool/TTool_Linux/TTool/modeling/SmartCardProtocol.xml
preinstallTTool/TTool_Linux/TTool/simulators/c++2/Makefile.defs 8 additions, 3 deletions

...tallTTool/TTool_Linux/TTool/simulators/c++2/Makefile.defs
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/TMLTransaction.cpp 76 additions, 54 deletions

...ux/TTool/simulators/c++2/src_simulator/TMLTransaction.cpp
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/TMLTransaction.h 10 additions, 3 deletions

...inux/TTool/simulators/c++2/src_simulator/TMLTransaction.h
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/Bus.cpp 19 additions, 0 deletions

...ol_Linux/TTool/simulators/c++2/src_simulator/arch/Bus.cpp
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/Bus.h 7 additions, 0 deletions

...Tool_Linux/TTool/simulators/c++2/src_simulator/arch/Bus.h
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/CPU.h 1 addition, 1 deletion

...Tool_Linux/TTool/simulators/c++2/src_simulator/arch/CPU.h
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/SchedulableDevice.h 6 additions, 0 deletions

...ol/simulators/c++2/src_simulator/arch/SchedulableDevice.h
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp 436 additions, 413 deletions

...Tool/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/arch/SingleCoreCPU.h 8 additions, 0 deletions

.../TTool/simulators/c++2/src_simulator/arch/SingleCoreCPU.h
preinstallTTool/TTool_Linux/TTool/simulators/c++2/src_simulator/definitions.h 5 additions, 1 deletion

...l_Linux/TTool/simulators/c++2/src_simulator/definitions.h

with 10182 additions and 7189 deletions

Please register or to comment