Merge branch 'master' into gayberne

a381a3ab · peastman · 5ecc8e00 · 1f7866ad · a381a3ab · a381a3ab
Commit a381a3ab authored Aug 01, 2016 by peastman
20 changed files
--- a/serialization/src/CustomCompoundBondForceProxy.cpp
+++ b/serialization/src/CustomCompoundBondForceProxy.cpp
--- a/serialization/src/CustomGBForceProxy.cpp
+++ b/serialization/src/CustomGBForceProxy.cpp
--- a/serialization/src/CustomNonbondedForceProxy.cpp
+++ b/serialization/src/CustomNonbondedForceProxy.cpp
--- a/serialization/src/CustomTorsionForceProxy.cpp
+++ b/serialization/src/CustomTorsionForceProxy.cpp
--- a/serialization/tests/TestSerializeCustomAngleForce.cpp
+++ b/serialization/tests/TestSerializeCustomAngleForce.cpp
--- a/serialization/tests/TestSerializeCustomBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomBondForce.cpp
--- a/serialization/tests/TestSerializeCustomCentroidBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomCentroidBondForce.cpp
--- a/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
--- a/serialization/tests/TestSerializeCustomGBForce.cpp
+++ b/serialization/tests/TestSerializeCustomGBForce.cpp
--- a/serialization/tests/TestSerializeCustomNonbondedForce.cpp
+++ b/serialization/tests/TestSerializeCustomNonbondedForce.cpp
--- a/serialization/tests/TestSerializeCustomTorsionForce.cpp
+++ b/serialization/tests/TestSerializeCustomTorsionForce.cpp
--- a/tests/TestCustomAngleForce.h
+++ b/tests/TestCustomAngleForce.h
--- a/tests/TestCustomBondForce.h
+++ b/tests/TestCustomBondForce.h
--- a/tests/TestCustomCentroidBondForce.h
+++ b/tests/TestCustomCentroidBondForce.h
--- a/tests/TestCustomCompoundBondForce.h
+++ b/tests/TestCustomCompoundBondForce.h
--- a/tests/TestCustomGBForce.h
+++ b/tests/TestCustomGBForce.h
--- a/tests/TestCustomIntegrator.h
+++ b/tests/TestCustomIntegrator.h
--- a/tests/TestCustomNonbondedForce.h
+++ b/tests/TestCustomNonbondedForce.h
--- a/tests/TestCustomTorsionForce.h
+++ b/tests/TestCustomTorsionForce.h
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt