Merge branch 'master' into applecl

61d5cc0f · Peter · e2999354 · afae4bc8 · 61d5cc0f · 61d5cc0f
Commit 61d5cc0f authored Apr 16, 2015 by Peter
20 changed files
--- a/platforms/reference/tests/TestReferenceSettle.cpp
+++ b/platforms/reference/tests/TestReferenceSettle.cpp
--- a/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVerletIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVirtualSites.cpp
+++ b/platforms/reference/tests/TestReferenceVirtualSites.cpp
--- a/plugins/amoeba/CMakeLists.txt
+++ b/plugins/amoeba/CMakeLists.txt
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/amoebaKernels.h
+++ b/plugins/amoeba/openmmapi/include/openmm/amoebaKernels.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaMultipoleForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaMultipoleForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaTorsionTorsionForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaTorsionTorsionForceImpl.h