Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MANYBODY/pair_comb3.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 14 2014, 14:00 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS1a8ee73f0abc: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11561 f3b2605a-c512-4ea7…
rLAMMPS31022e212c2a: fix typo in pair style kim - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1a8ee73f0abc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11561 f3b2605a-c512-4ea7… | Feb 13 2014 |