Merge branch 'morse-soft-cleanup' of https://github.com/Pakketeretet2/lammps into merge-pull-66
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> May 28 2016, 21:49 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSc0d4385a6175: Resolved merge conflict with upstream.
rLAMMPS5d6cf32dfe32: enable write_data support for umbrella improper style - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 |