Merge branch 'collected-small-fixes' of github.com:akohlmey/lammps into collected-small-fixes

# Conflicts:
#	cmake/CMakeLists.txt
This commit is contained in:
Axel Kohlmeyer 2019-06-11 14:03:27 -04:00
commit fd592d510f
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A

Diff Content Not Available