Merge branch 'master' into gayberne

2e9c418a · peastman · 8f532e31 · a4d327f5 · 2e9c418a · 2e9c418a
Commit 2e9c418a authored May 05, 2016 by peastman
20 changed files
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
--- a/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+++ b/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
--- a/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+++ b/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
--- a/serialization/src/CMAPTorsionForceProxy.cpp
+++ b/serialization/src/CMAPTorsionForceProxy.cpp
--- a/serialization/src/CustomAngleForceProxy.cpp
+++ b/serialization/src/CustomAngleForceProxy.cpp
--- a/serialization/src/CustomBondForceProxy.cpp
+++ b/serialization/src/CustomBondForceProxy.cpp
--- a/serialization/src/CustomCentroidBondForceProxy.cpp
+++ b/serialization/src/CustomCentroidBondForceProxy.cpp
--- a/serialization/src/CustomCompoundBondForceProxy.cpp
+++ b/serialization/src/CustomCompoundBondForceProxy.cpp
--- a/serialization/src/CustomTorsionForceProxy.cpp
+++ b/serialization/src/CustomTorsionForceProxy.cpp
--- a/serialization/src/HarmonicAngleForceProxy.cpp
+++ b/serialization/src/HarmonicAngleForceProxy.cpp
--- a/serialization/src/HarmonicBondForceProxy.cpp
+++ b/serialization/src/HarmonicBondForceProxy.cpp
--- a/serialization/src/MonteCarloAnisotropicBarostatProxy.cpp
+++ b/serialization/src/MonteCarloAnisotropicBarostatProxy.cpp
--- a/serialization/src/MonteCarloBarostatProxy.cpp
+++ b/serialization/src/MonteCarloBarostatProxy.cpp
--- a/serialization/src/MonteCarloMembraneBarostatProxy.cpp
+++ b/serialization/src/MonteCarloMembraneBarostatProxy.cpp
--- a/serialization/src/PeriodicTorsionForceProxy.cpp
+++ b/serialization/src/PeriodicTorsionForceProxy.cpp
--- a/serialization/src/RBTorsionForceProxy.cpp
+++ b/serialization/src/RBTorsionForceProxy.cpp