Homec4science

Conflict merged.

Authored by rouaze on Dec 6 2016, 14:26.

Description

Conflict merged.

Merged Changes

CommitAuthorDetailsCommitted
afdb53593515ollitrault
Modification on class Function and its children new commit 
Dec 6 2016
5fd0adc928b9ollitrault
Modifications on Function class and its children 
Dec 6 2016
31ff7749b067ollitrault
Git Pull Failed, commiting NumInt to proceed 
Dec 5 2016