Merge branch 'master' into amber-switching

Conflicts: wrappers/python/simtk/openmm/app/amberprmtopfile.py In fixing the merge conflict, I went ahead and fixed up the switchDistance logic to match what I did in CharmmPsfFile.

Merge branch 'master' into amber-switching
Conflicts: wrappers/python/simtk/openmm/app/amberprmtopfile.py In fixing the merge conflict, I went ahead and fixed up the switchDistance logic to match what I did in CharmmPsfFile.
1c938ceb · Jason Swails · a1113e7b · 167ae8a0 · 1c938ceb · 1c938ceb
Commit 1c938ceb authored Nov 20, 2015 by Jason Swails
20 changed files
--- a/serialization/CMakeLists.txt
+++ b/serialization/CMakeLists.txt
--- a/serialization/include/openmm/serialization/CompoundIntegratorProxy.h
+++ b/serialization/include/openmm/serialization/CompoundIntegratorProxy.h
--- a/serialization/include/openmm/serialization/SerializationNode.h
+++ b/serialization/include/openmm/serialization/SerializationNode.h
--- a/openmmapi/include/openmm/internal/GBVIForceImpl.h
+++ b/openmmapi/include/openmm/internal/GBVIForceImpl.h
--- a/serialization/src/GBVIForceProxy.cpp
+++ b/serialization/src/GBVIForceProxy.cpp
--- a/serialization/src/SerializationProxyRegistration.cpp
+++ b/serialization/src/SerializationProxyRegistration.cpp
--- a/serialization/tests/TestSerializeIntegrator.cpp
+++ b/serialization/tests/TestSerializeIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceGBVIForce.cpp
+++ b/platforms/reference/tests/TestReferenceGBVIForce.cpp
--- a/tests/TestCustomExternalForce.h
+++ b/tests/TestCustomExternalForce.h
--- a/serialization/tests/TestSerializeGBVIForce.cpp
+++ b/serialization/tests/TestSerializeGBVIForce.cpp
--- a/tests/TestGBSAOBCForce.h
+++ b/tests/TestGBSAOBCForce.h
--- a/tests/TestLocalEnergyMinimizer.h
+++ b/tests/TestLocalEnergyMinimizer.h
--- a/wrappers/python/filterPythonFiles.py
+++ b/wrappers/python/filterPythonFiles.py
--- a/wrappers/python/simtk/openmm/amd.py
+++ b/wrappers/python/simtk/openmm/amd.py
--- a/wrappers/python/simtk/openmm/app/amberinpcrdfile.py
+++ b/wrappers/python/simtk/openmm/app/amberinpcrdfile.py
--- a/wrappers/python/simtk/openmm/app/amberprmtopfile.py
+++ b/wrappers/python/simtk/openmm/app/amberprmtopfile.py
--- a/wrappers/python/simtk/openmm/app/charmmcrdfiles.py
+++ b/wrappers/python/simtk/openmm/app/charmmcrdfiles.py
--- a/wrappers/python/simtk/openmm/app/charmmparameterset.py
+++ b/wrappers/python/simtk/openmm/app/charmmparameterset.py
--- a/wrappers/python/simtk/openmm/app/charmmpsffile.py
+++ b/wrappers/python/simtk/openmm/app/charmmpsffile.py
--- a/wrappers/python/simtk/openmm/app/checkpointreporter.py
+++ b/wrappers/python/simtk/openmm/app/checkpointreporter.py