Merge branch 'master' into gayberne

2e9c418a · peastman · 8f532e31 · a4d327f5 · 2e9c418a · 2e9c418a
Commit 2e9c418a authored May 05, 2016 by peastman
20 changed files
--- a/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceForce.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceForce.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceProperDihedralBond.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceProperDihedralBond.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceRbDihedralBond.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceRbDihedralBond.cpp
--- a/platforms/reference/tests/TestReferenceMonteCarloMembraneBarostat.cpp
+++ b/platforms/reference/tests/TestReferenceMonteCarloMembraneBarostat.cpp
--- 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/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/src/AmoebaAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp