Base Functors

[dcoeurjo]

refactoring of functors

[kerautret]

I look it

[kerautret]

arg... 11 conflicts I look

[kerautret]

The merge tools give me an error, perhaps @dcoeurjo it could safer if you merge it yourself:

(error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm ' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.)

[dcoeurjo]

done

[kerautret]

thank, looks fine I merge