Skip to content
Snippets Groups Projects
Commit 9051a0ec authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36

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.
parents 8b4d3033 46231a5d
No related branches found
No related tags found
No related merge requests found
Showing
with 80 additions and 1896 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment