Merge github.com:leeping/openmm

e3b25204 · leeping · 41e9a095 · 74415dd9 · e3b25204 · e3b25204
Commit e3b25204 authored Jul 15, 2013 by leeping
20 changed files
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceVdwForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceVdwForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.h
--- a/plugins/cpupme/CMakeLists.txt
+++ b/plugins/cpupme/CMakeLists.txt
--- a/plugins/cpupme/include/internal/windowsExportPme.h
+++ b/plugins/cpupme/include/internal/windowsExportPme.h
--- a/plugins/cpupme/src/CpuPmeKernelFactory.cpp
+++ b/plugins/cpupme/src/CpuPmeKernelFactory.cpp
--- a/plugins/cpupme/src/CpuPmeKernelFactory.h
+++ b/plugins/cpupme/src/CpuPmeKernelFactory.h
--- a/plugins/cpupme/src/CpuPmeKernels.cpp
+++ b/plugins/cpupme/src/CpuPmeKernels.cpp
--- a/plugins/cpupme/src/CpuPmeKernels.h
+++ b/plugins/cpupme/src/CpuPmeKernels.h
--- a/plugins/cpupme/tests/CMakeLists.txt
+++ b/plugins/cpupme/tests/CMakeLists.txt
--- a/plugins/cpupme/tests/TestCpuPme.cpp
+++ b/plugins/cpupme/tests/TestCpuPme.cpp
--- a/plugins/drude/platforms/cuda/CMakeLists.txt
+++ b/plugins/drude/platforms/cuda/CMakeLists.txt
--- a/plugins/drude/platforms/cuda/src/CudaDrudeKernels.cpp
+++ b/plugins/drude/platforms/cuda/src/CudaDrudeKernels.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp