Merged changes from main branch

cf8a03e8 · peastman · f7f70136 · 31d02cdc · cf8a03e8 · cf8a03e8
Commit cf8a03e8 authored Mar 12, 2014 by peastman
20 changed files
--- 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/desmonddmsfile.py
+++ b/wrappers/python/simtk/openmm/app/desmonddmsfile.py
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py
--- a/wrappers/python/simtk/openmm/app/internal/amber_file_parser.py
+++ b/wrappers/python/simtk/openmm/app/internal/amber_file_parser.py
--- a/wrappers/python/simtk/openmm/app/internal/customgbforces.py
+++ b/wrappers/python/simtk/openmm/app/internal/customgbforces.py