Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
- Conflicts:
- src/MAKE/MINE/Makefile.openmpi-omp
Axel Kohlmeyer <akohlmey@gmail.com> | Feb 28 2016, 15:58 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
16431222dab3 | Axel Kohlmeyer | alternate approach. not yet 100% working. | Feb 27 2016 |