1. 14 Jun, 2019 2 commits
    • Camil Staps's avatar
      # This is a combination of 5 commits. · 9f3512a4
      Camil Staps authored
      # This is the 1st commit message:
      Merge branch 'master' of https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering
      
      # This is the commit message #2:
      
      trying to get it compiled again, fails due to 'Error [iTasks.Extensions.SVG.SVGEditor.icl,17,import]: fold not exported as a function/macro by module Data.Set'
      
      # This is the commit message #3:
      
      missing merge conflict resolved
      
      # This is the commit message #4:
      
      minor edit: space re-inserted
      
      # This is the commit message #5:
      
      fixed imports
      
      # This is the commit message #6:
      
      compiles again, now need to resolve linker-errors
      
      # This is the commit message #7:
      
      fix merge problems and imports
      
      # This is the commit message #8:
      
      Merge branch 'server-and-client-side-svg-rendering' of gitlab.science.ru.nl:clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering
      
      # This is the commit message #9:
      
      Merge branch 'server-and-client-side-svg-rendering' of https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering
      
      # Conflicts:
      #	Libraries/iTasks/Extensions/SVG/SVGEditor.icl
      
      # This is the commit message #10:
      
      Merge branch 'master' into server-and-client-side-svg-rendering
      
      # This is the commit message #1:
      
      Merge branch 'master' into server-and-client-side-svg-rendering
      
      # This is the commit message #2:
      
      Merge remote-tracking branch 'remotes/origin/master' into server-and-client-side-svg-rendering
      
      # This is the commit message #3:
      
      Merge abc-interpreter-instead-of-sapl into server-and-client-side-svg-rendering-with-abc-interpreter
      
      # This is the commit message #4:
      
      Merge abc-interpreter-instead-of-sapl into server-and-client-side-svg-rendering-with-abc-interpreter
      
      # This is the commit message #5:
      
      Fix imports after merging abc-interpreter-instead-of-sapl
      9f3512a4
    • Peter Achten's avatar
  2. 12 Jun, 2019 1 commit
  3. 19 Apr, 2019 1 commit
  4. 01 Mar, 2019 1 commit
  5. 21 Jan, 2019 1 commit
  6. 03 Dec, 2018 1 commit
  7. 11 Sep, 2018 1 commit
  8. 10 Sep, 2018 1 commit
  9. 21 Dec, 2017 2 commits
  10. 15 Sep, 2016 1 commit