Merge branch 'master' of https://github.com/rafwiewiora/openmm

0a2439ce · Rafal P. Wiewiora · c29de611 · 6ed5bc4e · 0a2439ce · 0a2439ce
Commit 0a2439ce authored Apr 20, 2017 by Rafal P. Wiewiora
20 changed files
--- a/serialization/src/HarmonicBondForceProxy.cpp
+++ b/serialization/src/HarmonicBondForceProxy.cpp
--- a/serialization/src/NonbondedForceProxy.cpp
+++ b/serialization/src/NonbondedForceProxy.cpp
--- a/serialization/src/PeriodicTorsionForceProxy.cpp
+++ b/serialization/src/PeriodicTorsionForceProxy.cpp
--- a/serialization/src/RBTorsionForceProxy.cpp
+++ b/serialization/src/RBTorsionForceProxy.cpp
--- a/serialization/src/SerializationNode.cpp
+++ b/serialization/src/SerializationNode.cpp
--- a/serialization/src/StateProxy.cpp
+++ b/serialization/src/StateProxy.cpp
--- a/serialization/src/SystemProxy.cpp
+++ b/serialization/src/SystemProxy.cpp
--- a/serialization/src/TabulatedFunctionProxies.cpp
+++ b/serialization/src/TabulatedFunctionProxies.cpp
--- a/serialization/src/XmlSerializer.cpp
+++ b/serialization/src/XmlSerializer.cpp
--- a/tests/TestCustomHbondForce.h
+++ b/tests/TestCustomHbondForce.h
--- a/tests/TestVirtualSites.h
+++ b/tests/TestVirtualSites.h
--- a/wrappers/python/simtk/openmm/app/data/amberfb15.xml
+++ b/wrappers/python/simtk/openmm/app/data/amberfb15.xml
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py
--- a/wrappers/python/simtk/openmm/app/gromacsgrofile.py
+++ b/wrappers/python/simtk/openmm/app/gromacsgrofile.py
--- a/wrappers/python/simtk/openmm/app/gromacstopfile.py
+++ b/wrappers/python/simtk/openmm/app/gromacstopfile.py
--- a/wrappers/python/simtk/openmm/app/pdbfile.py
+++ b/wrappers/python/simtk/openmm/app/pdbfile.py
--- a/wrappers/python/tests/TestDcdFile.py
+++ b/wrappers/python/tests/TestDcdFile.py
--- a/wrappers/python/tests/TestGromacsTopFile.py
+++ b/wrappers/python/tests/TestGromacsTopFile.py
--- a/wrappers/python/tests/systems/2ci2.pdb.gro
+++ b/wrappers/python/tests/systems/2ci2.pdb.gro
--- a/wrappers/python/tests/systems/2ci2.pdb.top
+++ b/wrappers/python/tests/systems/2ci2.pdb.top