Merge branch 'master-small-fixes' into lammps-icms
resolved conflict: src/pair_table.cpp
take HEAD version and replace 'n' with 'tablength'.
Axel Kohlmeyer <akohlmey@gmail.com> | Jun 13 2010, 22:22 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
2d37a8e579f0 | Axel Kohlmeyer | remove non-descript class-global variables n and nm1 | Jun 13 2010 |