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/serialization/tests/TestSerializeCMAPTorsion.cpp
+++ b/serialization/tests/TestSerializeCMAPTorsion.cpp
--- a/serialization/tests/TestSerializeCMMotionRemover.cpp
+++ b/serialization/tests/TestSerializeCMMotionRemover.cpp
--- a/serialization/tests/TestSerializeCustomAngleForce.cpp
+++ b/serialization/tests/TestSerializeCustomAngleForce.cpp
--- a/serialization/tests/TestSerializeCustomBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomBondForce.cpp
--- a/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
+++ b/serialization/tests/TestSerializeCustomCompoundBondForce.cpp
--- a/serialization/tests/TestSerializeCustomExternalForce.cpp
+++ b/serialization/tests/TestSerializeCustomExternalForce.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/TestSerializeCustomTorsionForce.cpp
+++ b/serialization/tests/TestSerializeCustomTorsionForce.cpp
--- a/serialization/tests/TestSerializeGBSAOBCForce.cpp
+++ b/serialization/tests/TestSerializeGBSAOBCForce.cpp
--- a/serialization/tests/TestSerializeGBVIForce.cpp
+++ b/serialization/tests/TestSerializeGBVIForce.cpp
--- a/serialization/tests/TestSerializeHarmonicAngleForce.cpp
+++ b/serialization/tests/TestSerializeHarmonicAngleForce.cpp
--- a/serialization/tests/TestSerializeHarmonicBondForce.cpp
+++ b/serialization/tests/TestSerializeHarmonicBondForce.cpp
--- a/serialization/tests/TestSerializeMonteCarloBarostat.cpp
+++ b/serialization/tests/TestSerializeMonteCarloBarostat.cpp
--- a/serialization/tests/TestSerializeNonbondedForce.cpp
+++ b/serialization/tests/TestSerializeNonbondedForce.cpp
--- a/serialization/tests/TestSerializePeriodicTorsionForce.cpp
+++ b/serialization/tests/TestSerializePeriodicTorsionForce.cpp
--- a/serialization/tests/TestSerializeRBTorsionForce.cpp
+++ b/serialization/tests/TestSerializeRBTorsionForce.cpp
--- a/wrappers/generateWrappers.py
+++ b/wrappers/generateWrappers.py
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt