Merge branch 'master' of https://github.com/stephanmg/lammps into merge-pull-45
- Resolved Conflicts:
- src/library.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Apr 4 2016, 22:11 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS63612f33acd1: Formatting.
rLAMMPS439a71339ff2: Merge branch 'merge-pull-44' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 63612f33acd1 | stephanmg | Formatting. | Apr 4 2016 | |||
| f0234946229c | stephanmg | Check for errors (flag is set) in lammps_gather_atoms and lammps_scatter_atoms… | Apr 4 2016 |