Merge branch 'master' of ssh://c4science.ch/source/espic2d
Conflicts:
src/intel.mk
Description
Description
Details
Details
- Committed
lebars May 25 2020, 15:44 - Pushed
lebars May 25 2020, 15:45 - Parents
- rFENNECS05a7e66f0dc1: added variables in intel.mk for finding libraries
rFENNECS7789baa0c8e5: Merge branch 'master' of ssh://c4science.ch/source/espic2d - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7789baa0c8e5 | lebars | Merge branch 'master' of ssh://c4science.ch/source/espic2d | May 25 2020 | |||
| c543c5898416 | lebars | Corrected files to remove several compiler warnings Added ifdef for xgrafix | May 25 2020 |