Merge branch 'master' of github.com:SimTk/openmm

708c4246 · Lee-Ping · d284e2b8 · ec90b4bb · 708c4246 · 708c4246
Commit 708c4246 authored Feb 26, 2014 by Lee-Ping
20 changed files
--- a/plugins/drude/CMakeLists.txt
+++ b/plugins/drude/CMakeLists.txt
--- a/serialization/include/openmm/serialization/TabulatedFunctionProxies.h
+++ b/serialization/include/openmm/serialization/TabulatedFunctionProxies.h
--- a/serialization/src/CustomCompoundBondForceProxy.cpp
+++ b/serialization/src/CustomCompoundBondForceProxy.cpp
--- a/serialization/src/CustomGBForceProxy.cpp
+++ b/serialization/src/CustomGBForceProxy.cpp
--- a/serialization/src/CustomHbondForceProxy.cpp
+++ b/serialization/src/CustomHbondForceProxy.cpp
--- a/serialization/src/CustomNonbondedForceProxy.cpp
+++ b/serialization/src/CustomNonbondedForceProxy.cpp
--- a/serialization/src/SerializationProxyRegistration.cpp
+++ b/serialization/src/SerializationProxyRegistration.cpp
--- a/serialization/src/TabulatedFunctionProxies.cpp
+++ b/serialization/src/TabulatedFunctionProxies.cpp
--- a/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
--- a/serialization/tests/TestSerializeCustomGBForce.cpp
+++ b/serialization/tests/TestSerializeCustomGBForce.cpp
--- a/serialization/tests/TestSerializeCustomHbondForce.cpp
+++ b/serialization/tests/TestSerializeCustomHbondForce.cpp
--- a/serialization/tests/TestSerializeCustomNonbondedForce.cpp
+++ b/serialization/tests/TestSerializeCustomNonbondedForce.cpp
--- a/serialization/tests/TestSerializeTabulatedFunctions.cpp
+++ b/serialization/tests/TestSerializeTabulatedFunctions.cpp
--- a/tests/TestSplineFitter.cpp
+++ b/tests/TestSplineFitter.cpp
--- a/wrappers/generateWrappers.py
+++ b/wrappers/generateWrappers.py
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
--- a/wrappers/python/simtk/openmm/app/amberprmtopfile.py
+++ b/wrappers/python/simtk/openmm/app/amberprmtopfile.py
--- a/wrappers/python/simtk/openmm/app/data/absinth.xml
+++ b/wrappers/python/simtk/openmm/app/data/absinth.xml
--- a/wrappers/python/simtk/openmm/app/data/iamoeba.xml
+++ b/wrappers/python/simtk/openmm/app/data/iamoeba.xml
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py