1. 13 Mar, 2019 1 commit
  2. 12 Mar, 2019 1 commit
    • Simon Barner's avatar
      Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3337 · 557f2feb
      Simon Barner authored
      
      
      Conflicts:
      	org.fortiss.af3.deployment/META-INF/MANIFEST.MF
      	org.fortiss.af3.deployment/plugin.xml
      	org.fortiss.af3.exploration/META-INF/MANIFEST.MF
      	org.fortiss.af3.exploration/plugin.xml
      	org.fortiss.af3.partition/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.beagle/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.hierarchic/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.hierarchic/plugin.xml
      	org.fortiss.af3.platform/plugin.xml
      	org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
      	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/.ratings
      	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/SimpleTrafficLightsCodeGenerationExample.java
      	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/c/CCodeEquivalenceTest.java
      	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/java/JavaEquivalenceTest_SimpleTrafficLights.java
      	org.fortiss.af3.safetycases/META-INF/MANIFEST.MF
      	org.fortiss.af3.safetycases/plugin.xml
      	org.fortiss.af3.schedule/META-INF/MANIFEST.MF
      	org.fortiss.af3.schedule/plugin.xml
      	org.fortiss.af3.task/META-INF/MANIFEST.MF
      	org.fortiss.af3.task/plugin.xml
      Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
      557f2feb
  3. 11 Mar, 2019 5 commits
  4. 07 Mar, 2019 2 commits
  5. 03 Mar, 2019 3 commits
  6. 01 Mar, 2019 1 commit
  7. 28 Feb, 2019 2 commits
  8. 27 Feb, 2019 2 commits
  9. 26 Feb, 2019 4 commits
  10. 25 Feb, 2019 9 commits
  11. 23 Feb, 2019 2 commits
  12. 21 Feb, 2019 7 commits
  13. 19 Feb, 2019 1 commit