Merge remote-tracking branch 'upstream/master'

eb232608 · John Chodera (MSKCC) · 62581e9c · 7f8c5089 · eb232608 · eb232608
Commit eb232608 authored Apr 22, 2015 by John Chodera (MSKCC)
7 changed files
--- a/wrappers/python/src/swig_doxygen/OpenMM.i
+++ b/wrappers/python/src/swig_doxygen/OpenMM.i
--- a/wrappers/python/src/swig_doxygen/doxygen/Doxyfile.in
+++ b/wrappers/python/src/swig_doxygen/doxygen/Doxyfile.in
--- a/wrappers/python/tests/TestForceField.py
+++ b/wrappers/python/tests/TestForceField.py
--- a/wrappers/python/tests/TestModeller.py
+++ b/wrappers/python/tests/TestModeller.py
--- a/wrappers/python/tests/TestPdbFile.py
+++ b/wrappers/python/tests/TestPdbFile.py
--- a/wrappers/python/tests/TestUnitCell.py
+++ b/wrappers/python/tests/TestUnitCell.py
--- a/wrappers/python/tests/systems/Mg_water.prmtop
+++ b/wrappers/python/tests/systems/Mg_water.prmtop