Merge branch 'master' into nucleic

fd473eea · Peter Eastman · 0a751b5b · 6a985cfd · fd473eea · fd473eea
Commit fd473eea authored Oct 29, 2015 by Peter Eastman
20 changed files
--- 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/src/swig_doxygen/swig_lib/python/pythoncode.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/pythoncode.i
--- a/wrappers/python/src/swig_doxygen/swig_lib/python/typemaps.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/typemaps.i
--- a/wrappers/python/tests/TestAPIUnits.py
+++ b/wrappers/python/tests/TestAPIUnits.py
--- a/wrappers/python/tests/TestAmberInpcrdFile.py
+++ b/wrappers/python/tests/TestAmberInpcrdFile.py
--- 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/TestCheckpointReporter.py
+++ b/wrappers/python/tests/TestCheckpointReporter.py
--- a/wrappers/python/tests/TestForceField.py
+++ b/wrappers/python/tests/TestForceField.py
--- a/wrappers/python/tests/TestForceGroups.py
+++ b/wrappers/python/tests/TestForceGroups.py
--- a/wrappers/python/tests/TestGromacsTopFile.py
+++ b/wrappers/python/tests/TestGromacsTopFile.py
--- a/wrappers/python/tests/TestNumpyCompatibility.py
+++ b/wrappers/python/tests/TestNumpyCompatibility.py
--- a/wrappers/python/tests/TestPdbFile.py
+++ b/wrappers/python/tests/TestPdbFile.py
--- a/wrappers/python/tests/TestPdbxFile.py
+++ b/wrappers/python/tests/TestPdbxFile.py
--- a/wrappers/python/tests/TestPickle.py
+++ b/wrappers/python/tests/TestPickle.py
--- a/wrappers/python/tests/TestSwigWrappers.py
+++ b/wrappers/python/tests/TestSwigWrappers.py
--- a/wrappers/python/tests/TestTopology.py
+++ b/wrappers/python/tests/TestTopology.py
--- a/wrappers/python/tests/systems/5dhfr_cube.pdb
+++ b/wrappers/python/tests/systems/5dhfr_cube.pdb
--- a/wrappers/python/tests/systems/5dhfr_cube.psf
+++ b/wrappers/python/tests/systems/5dhfr_cube.psf
--- a/wrappers/python/tests/systems/alanine-dipeptide-amoeba-forces.xml
+++ b/wrappers/python/tests/systems/alanine-dipeptide-amoeba-forces.xml