Merge pull request #3 from openmm/master

Update from upstream

Merge pull request #3 from openmm/master
Update from upstream
7e72bafb · Zheng GONG · GitHub · 83b8ea75 · f6431a42 · 7e72bafb
Unverified Commit 7e72bafb authored Dec 21, 2019 by Zheng GONG Committed by GitHub Dec 21, 2019
20 changed files
--- a/serialization/tests/TestSerializeNoseHooverIntegrator.cpp
+++ b/serialization/tests/TestSerializeNoseHooverIntegrator.cpp
--- a/tests/TestNoseHooverIntegrator.h
+++ b/tests/TestNoseHooverIntegrator.h
--- a/tests/TestNoseHooverThermostat.h
+++ b/tests/TestNoseHooverThermostat.h
--- a/wrappers/generateWrappers.py
+++ b/wrappers/generateWrappers.py
--- a/wrappers/python/setup.py
+++ b/wrappers/python/setup.py
--- a/wrappers/python/simtk/openmm/app/charmmpsffile.py
+++ b/wrappers/python/simtk/openmm/app/charmmpsffile.py
--- a/wrappers/python/simtk/openmm/app/data/DLPC.pdb
+++ b/wrappers/python/simtk/openmm/app/data/DLPC.pdb
--- a/wrappers/python/simtk/openmm/app/data/DLPE.pdb
+++ b/wrappers/python/simtk/openmm/app/data/DLPE.pdb
--- a/wrappers/python/simtk/openmm/app/data/DMPC.pdb
+++ b/wrappers/python/simtk/openmm/app/data/DMPC.pdb
--- a/wrappers/python/simtk/openmm/app/data/DOPC.pdb
+++ b/wrappers/python/simtk/openmm/app/data/DOPC.pdb
--- a/wrappers/python/simtk/openmm/app/data/DPPC.pdb
+++ b/wrappers/python/simtk/openmm/app/data/DPPC.pdb
--- a/wrappers/python/simtk/openmm/app/modeller.py
+++ b/wrappers/python/simtk/openmm/app/modeller.py
--- a/wrappers/python/src/swig_doxygen/swigInputBuilder.py
+++ b/wrappers/python/src/swig_doxygen/swigInputBuilder.py
--- a/wrappers/python/src/swig_doxygen/swigInputConfig.py
+++ b/wrappers/python/src/swig_doxygen/swigInputConfig.py
--- a/wrappers/python/tests/TestAPIUnits.py
+++ b/wrappers/python/tests/TestAPIUnits.py
--- a/wrappers/python/tests/TestCharmmFiles.py
+++ b/wrappers/python/tests/TestCharmmFiles.py
--- a/wrappers/python/tests/TestIntegrators.py
+++ b/wrappers/python/tests/TestIntegrators.py
--- a/wrappers/python/tests/systems/MoS2-namd.inp
+++ b/wrappers/python/tests/systems/MoS2-namd.inp
--- a/wrappers/python/tests/systems/MoS2.pdb
+++ b/wrappers/python/tests/systems/MoS2.pdb
--- a/wrappers/python/tests/systems/MoS2.prm
+++ b/wrappers/python/tests/systems/MoS2.prm