Merge branch 'merge-pull-66' into lammps-icms
Documentation and corrections for pair style morse/soft from Stefan Paquay
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> May 28 2016, 21:57 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSfab73a9d520e: Merge branch 'morse-soft-cleanup' of https://github.com/Pakketeretet2/lammps…
rLAMMPSa02af68a22b4: Merge branch 'merge-pull-65' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| fab73a9d520e | Axel Kohlmeyer | Merge branch 'morse-soft-cleanup' of https://github.com/Pakketeretet2/lammps… | May 28 2016 | |||
| c0d4385a6175 | Stefan Paquay | Resolved merge conflict with upstream. | May 28 2016 | |||
| ed8859aced87 | Stefan Paquay | Made example legal command. | May 28 2016 | |||
| 1cb1f88049e5 | Stefan Paquay | Made check for narg consistent with reduced number of args. | May 28 2016 | |||
| 7e6adb81c371 | Stefan Paquay | Updated doc/src/pair_morse.txt | May 28 2016 | |||
| 56e67fac70da | Stefan Paquay | Removed obsolete variable from pair_morse_soft. | May 28 2016 | |||
| bd81c9b9e8f4 | Stefan Paquay | Fixed/cleaned up pair morse/soft | May 28 2016 |