Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Conflicts:
- doc/pair_reax.txt
Axel Kohlmeyer <akohlmey@gmail.com> | Mar 25 2016, 12:51 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ff4498fcdb0d | athomps | Added note about ev | Mar 24 2016 | |||
154eb1f886fd | athomps | Updated Adri's contact info | Mar 23 2016 |