Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool

simulators/c++2/Makefile

simulators/c++2/src_simulator/app/TMLCommand.cpp

simulators/c++2/src_simulator/app/TMLDelayCommand.cpp

simulators/c++2/src_simulator/app/TMLDelayCommand.h

simulators/c++2/src_simulator/arch/RRScheduler.cpp

simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp

...slator/tomappingsystemc2/DiploSimulatorCodeGenerator.java

...va/tmltranslator/tomappingsystemc2/MappedSystemCTask.java

...a/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java

ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java

...st/resources/tmltranslator/simulator/fpgaTest-penalty.xml

...l/src/test/resources/tmltranslator/simulator/fpgaTest.xml

...est/resources/tmltranslator/simulator/mono-RR-penalty.xml

ttool/src/test/resources/tmltranslator/simulator/mono-RR.xml

...t/resources/tmltranslator/simulator/mono-RRPB-penalty.xml

.../src/test/resources/tmltranslator/simulator/mono-RRPB.xml

...st/resources/tmltranslator/simulator/multi-RR-penalty.xml

...l/src/test/resources/tmltranslator/simulator/multi-RR.xml

.../resources/tmltranslator/simulator/multi-RRPB-penalty.xml

...src/test/resources/tmltranslator/simulator/multi-RRPB.xml