Merge pull request #3 from openmm/master

Sync with official repo

Merge pull request #3 from openmm/master
Sync with official repo
8dd60914 · Tristan Croll · GitHub · 3475b790 · 75c1fcb6 · 8dd60914
Unverified Commit 8dd60914 authored Nov 22, 2019 by Tristan Croll Committed by GitHub Nov 22, 2019
20 changed files
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
--- a/plugins/amoeba/wrappers/Doxyfile.in
+++ b/plugins/amoeba/wrappers/Doxyfile.in
--- a/plugins/cpupme/src/CpuPmeKernels.h
+++ b/plugins/cpupme/src/CpuPmeKernels.h
--- a/plugins/cudacompiler/src/CudaCompilerKernels.h
+++ b/plugins/cudacompiler/src/CudaCompilerKernels.h
--- a/plugins/drude/platforms/cuda/src/CudaDrudeKernels.h
+++ b/plugins/drude/platforms/cuda/src/CudaDrudeKernels.h
--- a/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.h
+++ b/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.h
--- a/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.cpp
+++ b/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.cpp
--- a/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.h
+++ b/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.h
--- a/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.h
+++ b/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.h
--- a/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.h
+++ b/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.h
--- a/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
--- a/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.h
+++ b/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.h
--- a/serialization/include/openmm/serialization/BAOABLangevinIntegratorProxy.h
+++ b/serialization/include/openmm/serialization/BAOABLangevinIntegratorProxy.h
--- a/serialization/src/BAOABLangevinIntegratorProxy.cpp
+++ b/serialization/src/BAOABLangevinIntegratorProxy.cpp
--- a/serialization/src/SerializationProxyRegistration.cpp
+++ b/serialization/src/SerializationProxyRegistration.cpp
--- a/serialization/src/VariableLangevinIntegratorProxy.cpp
+++ b/serialization/src/VariableLangevinIntegratorProxy.cpp
--- a/serialization/src/VariableVerletIntegratorProxy.cpp
+++ b/serialization/src/VariableVerletIntegratorProxy.cpp
--- a/serialization/tests/TestSerializeIntegrator.cpp
+++ b/serialization/tests/TestSerializeIntegrator.cpp
--- a/serialization/tests/TestSerializeState.cpp
+++ b/serialization/tests/TestSerializeState.cpp
--- a/tests/TestBAOABLangevinIntegrator.h
+++ b/tests/TestBAOABLangevinIntegrator.h