• 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
Name
Last commit
Last update
..
Applications Loading commit data...
AsyncShareTest Loading commit data...
BasicAPIExamples Loading commit data...
Distributed Loading commit data...
GIS Loading commit data...
Games Loading commit data...
Graphics/BasicImagesExamples Loading commit data...
RemoteServiceExamples Loading commit data...
RemoteShareExamples Loading commit data...
WebPublic Loading commit data...
BasicAPIExamples.prj.default Loading commit data...
CreateBasicAPIExamples.icl Loading commit data...
CreateBasicAPIExamples.prj.default Loading commit data...