Merge changes from main branch

18295108 · peastman · e6101f68 · 8d7234e5 · 18295108 · 18295108
Commit 18295108 authored Sep 05, 2017 by peastman
14 changed files
--- a/wrappers/python/simtk/openmm/app/pdbxfile.py
+++ b/wrappers/python/simtk/openmm/app/pdbxfile.py
--- a/wrappers/python/src/swig_doxygen/swigInputBuilder.py
+++ b/wrappers/python/src/swig_doxygen/swigInputBuilder.py
--- a/wrappers/python/src/swig_doxygen/swigInputConfig.py
+++ b/wrappers/python/src/swig_doxygen/swigInputConfig.py
--- a/wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
--- a/wrappers/python/tests/TestAmberPrmtopFile.py
+++ b/wrappers/python/tests/TestAmberPrmtopFile.py
--- a/wrappers/python/tests/TestCharmmFiles.py
+++ b/wrappers/python/tests/TestCharmmFiles.py
--- a/wrappers/python/tests/TestForceField.py
+++ b/wrappers/python/tests/TestForceField.py
--- a/wrappers/python/tests/TestGromacsTopFile.py
+++ b/wrappers/python/tests/TestGromacsTopFile.py
--- a/wrappers/python/tests/TestPdbxFile.py
+++ b/wrappers/python/tests/TestPdbxFile.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
--- a/wrappers/python/tests/systems/ff_with_includes.xml
+++ b/wrappers/python/tests/systems/ff_with_includes.xml
--- a/wrappers/python/tests/systems/improper.psf
+++ b/wrappers/python/tests/systems/improper.psf
--- a/wrappers/python/tests/systems/impropers_ordering_tetrapeptide.pdb
+++ b/wrappers/python/tests/systems/impropers_ordering_tetrapeptide.pdb