1. 04 Sep, 2018 3 commits
  2. 29 Aug, 2018 1 commit
  3. 25 Aug, 2018 1 commit
  4. 24 Aug, 2018 6 commits
  5. 23 Aug, 2018 10 commits
  6. 22 Aug, 2018 4 commits
  7. 21 Aug, 2018 2 commits
  8. 20 Aug, 2018 1 commit
  9. 16 Aug, 2018 1 commit
  10. 14 Aug, 2018 1 commit
  11. 13 Aug, 2018 2 commits
  12. 11 Aug, 2018 1 commit
  13. 08 Aug, 2018 1 commit
  14. 07 Aug, 2018 5 commits
  15. 06 Aug, 2018 1 commit
    • aziz's avatar
      Merge branch '2802-FMU_Cosimulation' of · c56b32cd
      aziz authored
      https://git.fortiss.org/af3/af3.git
      
       into 2802-FMU_Cosimulation
      
      Conflicts:
      	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/generator/.ratings
      	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/generator/FMUGeneratorEasyStartMenu.java
      	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/properties/.ratings
      	org.fortiss.af3.cosimulation.ui/build.properties
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/editor/.ratings
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/editor/ExternalSpecificationEditor.java
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/simulator/.ratings
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/simulator/CosimulatorGraphGenerator.java
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/simulator/FMUSimulatorEasyStartMenu.java
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/simulator/FMUSimulatorExecutionTarget.java
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/utils/.ratings
      	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/utils/EditorUtils.java
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/compose/.ratings
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/compose/CosimulationPrototypeProvider.java
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/simulator/.ratings
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/simulator/ComponentArchitectureToExternalSimulationConfiguration.java
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/simulator/ExecutableFMUSpecification.java
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/simulator/ExecutableFMUSpecificationTransformation.java
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/textgen/.ratings
      	org.fortiss.af3.cosimulation/src/org/fortiss/af3/cosimulation/textgen/CosimulationConfigurationTextGenerator.java
      Signed-off-by: default avataraziz <aziz@fortiss.org>
      c56b32cd