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/cpupme/tests/CMakeLists.txt
+++ b/plugins/cpupme/tests/CMakeLists.txt
--- a/plugins/drude/CMakeLists.txt
+++ b/plugins/drude/CMakeLists.txt
--- a/plugins/drude/openmmapi/src/DrudeForceImpl.cpp
+++ b/plugins/drude/openmmapi/src/DrudeForceImpl.cpp
--- a/plugins/drude/platforms/cuda/CMakeLists.txt
+++ b/plugins/drude/platforms/cuda/CMakeLists.txt
--- a/plugins/drude/platforms/opencl/CMakeLists.txt
+++ b/plugins/drude/platforms/opencl/CMakeLists.txt
--- a/plugins/drude/platforms/reference/CMakeLists.txt
+++ b/plugins/drude/platforms/reference/CMakeLists.txt
--- a/plugins/drude/platforms/reference/tests/CMakeLists.txt
+++ b/plugins/drude/platforms/reference/tests/CMakeLists.txt
--- a/plugins/rpmd/CMakeLists.txt
+++ b/plugins/rpmd/CMakeLists.txt
--- a/plugins/rpmd/openmmapi/include/openmm/RPMDIntegrator.h
+++ b/plugins/rpmd/openmmapi/include/openmm/RPMDIntegrator.h
--- a/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp
+++ b/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp
--- a/plugins/rpmd/platforms/cuda/CMakeLists.txt
+++ b/plugins/rpmd/platforms/cuda/CMakeLists.txt
--- a/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+++ b/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
--- a/plugins/rpmd/platforms/opencl/CMakeLists.txt
+++ b/plugins/rpmd/platforms/opencl/CMakeLists.txt
--- a/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+++ b/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
--- a/plugins/rpmd/platforms/reference/CMakeLists.txt
+++ b/plugins/rpmd/platforms/reference/CMakeLists.txt
--- a/plugins/rpmd/platforms/reference/tests/CMakeLists.txt
+++ b/plugins/rpmd/platforms/reference/tests/CMakeLists.txt
--- a/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
+++ b/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
--- a/serialization/include/openmm/serialization/SerializationNode.h
+++ b/serialization/include/openmm/serialization/SerializationNode.h
--- a/serialization/src/AndersenThermostatProxy.cpp
+++ b/serialization/src/AndersenThermostatProxy.cpp
--- a/serialization/src/CMAPTorsionForceProxy.cpp
+++ b/serialization/src/CMAPTorsionForceProxy.cpp