Merge branch 'master' of ssh://c4science.ch/source/sp4e
Description
Description
Details
Details
- Committed
tlemaire Dec 3 2018, 19:08 - Pushed
tlemaire Dec 5 2018, 14:42 - Parents
- R7571:363a3a59c357: Merge branch 'master' of ssh://c4science.ch/source/sp4e
R7571:52faafbb8fbe: Resolved merge conflict - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
363a3a59c357 | frerot | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Dec 3 2018 | |||
e16a226e15f1 | frerot | added correction for optimization of particle code | Dec 3 2018 |