• Cedric Roux's avatar
    Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36 · 9051a0ec
    Cedric Roux authored
    Note: we don't include the last commit from origin/recode_itti_from_scratch
    because it is just astyle formatting. As of today we don't enforce
    astyle and including this work would lead to future merge conflicts.
    A proper process to enforce astyle has to be put in place. In the
    meantime, no astyle allowed in commits if the changes are too big
    and not relevant to work done.
    9051a0ec
CMakeLists.txt 90.5 KB