Merge branch 'master' of github.com:alxvov/lammps into OSO

- solved conflict in doc/src/fix_nve_spin.txt
This commit is contained in:
julient31
2019-10-04 08:56:49 -06:00
35 changed files with 1688 additions and 152 deletions

View File

@ -2276,6 +2276,7 @@ qoffload
qopenmp
qoverride
qtb
quadratically
quadrupolar
Quant
quartic