Homec4science

Merge branch 'master' of ssh://c4science.ch/source/sp4e

Authored by tlemaire on Dec 3 2018, 19:08.

Description

Merge branch 'master' of ssh://c4science.ch/source/sp4e

Details

Committed
tlemaireDec 3 2018, 19:08
Pushed
tlemaireDec 5 2018, 14:42
Parents
R7571:363a3a59c357: Merge branch 'master' of ssh://c4science.ch/source/sp4e
R7571:52faafbb8fbe: Resolved merge conflict
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
363a3a59c357frerot
Merge branch 'master' of ssh://c4science.ch/source/sp4e 
Dec 3 2018
e16a226e15f1frerot
added correction for optimization of particle code 
Dec 3 2018