Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/compute_chunk_atom.cpp
src/pair_morse.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Apr 28 2015, 16:32 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSa6c0fb87e205: Corrected error in etail and ptail
rLAMMPSf3abe5b8af7a: fix bug reported by "kimmo" - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a6c0fb87e205 | athomps | Corrected error in etail and ptail | Apr 28 2015 | |||
| 5a88d7477a46 | athomps | Corrected error in etail and ptail | Apr 28 2015 | |||
| e416658ad0a0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13434 f3b2605a-c512-4ea7… | Apr 27 2015 | |||
| 9c83d53cf061 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13433 f3b2605a-c512-4ea7… | Apr 27 2015 | |||
| 45ca7c3df5c1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13432 f3b2605a-c512-4ea7… | Apr 27 2015 | |||
| f3b21a9ca31b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13431 f3b2605a-c512-4ea7… | Apr 27 2015 | |||
| 51d6ecbae9fe | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13430 f3b2605a-c512-4ea7… | Apr 27 2015 | |||
| 19e272943a16 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13429 f3b2605a-c512-4ea7… | Apr 27 2015 |