Merge branch 'master' into gayberne

2e9c418a · peastman · 8f532e31 · a4d327f5 · 2e9c418a · 2e9c418a
Commit 2e9c418a authored May 05, 2016 by peastman
20 changed files
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp