Merge remote-tracking branch 'upstream/master'

eb232608 · John Chodera (MSKCC) · 62581e9c · 7f8c5089 · eb232608 · eb232608
Commit eb232608 authored Apr 22, 2015 by John Chodera (MSKCC)
20 changed files
--- 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/src/AmoebaVdwForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaVdwForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.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/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaMultipoleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaWcaDispersionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaWcaDispersionForce.cpp
--- a/plugins/amoeba/wrappers/generateAmoebaWrappers.py
+++ b/plugins/amoeba/wrappers/generateAmoebaWrappers.py
--- a/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/reference/tests/TestReferenceDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeSCFIntegrator.cpp
--- a/plugins/rpmd/openmmapi/include/openmm/RPMDMonteCarloBarostat.h
+++ b/plugins/rpmd/openmmapi/include/openmm/RPMDMonteCarloBarostat.h
--- a/plugins/rpmd/openmmapi/include/openmm/RPMDUpdater.h
+++ b/plugins/rpmd/openmmapi/include/openmm/RPMDUpdater.h
--- a/plugins/rpmd/openmmapi/include/openmm/internal/RPMDMonteCarloBarostatImpl.h
+++ b/plugins/rpmd/openmmapi/include/openmm/internal/RPMDMonteCarloBarostatImpl.h
--- a/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp
+++ b/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp