Merge branch 'master' of github.com:pandegroup/openmm into sphinx

cd4031f9 · Robert T. McGibbon · 9af3e56b · 4d32047c · cd4031f9 · cd4031f9
Commit cd4031f9 authored Dec 03, 2015 by Robert T. McGibbon
9 changed files
--- a/wrappers/python/simtk/openmm/app/data/tip4pew.xml
+++ b/wrappers/python/simtk/openmm/app/data/tip4pew.xml
--- a/wrappers/python/simtk/openmm/app/data/tip5p.xml
+++ b/wrappers/python/simtk/openmm/app/data/tip5p.xml
--- 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/modeller.py
+++ b/wrappers/python/simtk/openmm/app/modeller.py
--- a/wrappers/python/simtk/openmm/app/pdbfile.py
+++ b/wrappers/python/simtk/openmm/app/pdbfile.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/tests/TestAmberPrmtopFile.py
+++ b/wrappers/python/tests/TestAmberPrmtopFile.py