Merge branch 'master' into qc

51828eaa · Peter Eastman · cf8a03e8 · 5ed9dd65 · 51828eaa · 51828eaa
Commit 51828eaa authored May 05, 2014 by Peter Eastman
20 changed files
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaBondForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaBondForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaInPlaneAngleForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaInPlaneAngleForceImpl.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/AmoebaOutOfPlaneBendForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaOutOfPlaneBendForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaPiTorsionForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaPiTorsionForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaStretchBendForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaStretchBendForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaTorsionTorsionForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaTorsionTorsionForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaVdwForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaVdwForceImpl.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaWcaDispersionForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaWcaDispersionForceImpl.h
--- a/plugins/amoeba/openmmapi/src/AmoebaAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaAngleForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaAngleForceImpl.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaBondForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaBondForceImpl.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForceImpl.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaMultipoleForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaMultipoleForceImpl.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForceImpl.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp