Merge github.com:SimTk/openmm

19d2885a · Lee-Ping · 99ef4344 · 57a6768e · 19d2885a · 19d2885a
Commit 19d2885a authored Jan 23, 2014 by Lee-Ping
20 changed files
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaVdwForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaVdwForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceWcaDispersionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceWcaDispersionForce.cpp
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaAngleForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaAngleForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaBondForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaBondForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaGeneralizedKirkwoodForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaGeneralizedKirkwoodForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaInPlaneAngleForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaInPlaneAngleForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaMultipoleForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaMultipoleForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaOutOfPlaneBendForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaOutOfPlaneBendForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaPiTorsionForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaPiTorsionForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaStretchBendForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaStretchBendForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaTorsionTorsionForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaTorsionTorsionForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaVdwForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaVdwForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/AmoebaWcaDispersionForceProxy.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/AmoebaWcaDispersionForceProxy.h
--- a/plugins/amoeba/serialization/include/openmm/serialization/internal/windowsExportAmoebaSerialization.h
+++ b/plugins/amoeba/serialization/include/openmm/serialization/internal/windowsExportAmoebaSerialization.h
--- a/plugins/amoeba/serialization/src/AmoebaSerializationProxyRegistration.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaSerializationProxyRegistration.cpp
--- a/plugins/amoeba/serialization/tests/CMakeLists.txt
+++ b/plugins/amoeba/serialization/tests/CMakeLists.txt
--- a/plugins/amoeba/wrappers/CMakeLists.txt
+++ b/plugins/amoeba/wrappers/CMakeLists.txt
--- a/plugins/amoeba/wrappers/CWrapper_Header.xslt
+++ b/plugins/amoeba/wrappers/CWrapper_Header.xslt
--- a/plugins/amoeba/wrappers/CWrapper_Source.xslt
+++ b/plugins/amoeba/wrappers/CWrapper_Source.xslt