Homec4science

correction conflictMerge branch 'master' of lsmssrv1.epfl.ch:tamaas

Authored by Valentine <valentine@lsmspc27.epfl.ch> on Apr 13 2016, 13:36.

Description

correction conflictMerge branch 'master' of lsmssrv1.epfl.ch:tamaas

Event Timeline

Valentine <valentine@lsmspc27.epfl.ch> committed rTAMAAS91d6d35e9407: correction conflictMerge branch 'master' of lsmssrv1.epfl.ch:tamaas (authored by Valentine <valentine@lsmspc27.epfl.ch>).Apr 13 2016, 13:36

Merged Changes

CommitAuthorDetailsCommitted
37457a69021dfrerot
corrected stagnation criterion 
Apr 12 2016