Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/Depend.sh
Axel Kohlmeyer <akohlmey@gmail.com> | May 20 2013, 12:24 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ab502fda5977 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9893 f3b2605a-c512-4ea7… | May 19 2013 | |||
471694a7e7be | athomps | Added Strachan citation to rdx, removed Al_Al0_AlN | May 17 2013 | |||
e7f6d3b60cbc | athomps | Added ReaxFF.lg citation | May 17 2013 |