Merge remote-tracking branch 'upstream/master'

71d33617 · John Chodera (MSKCC) · eb232608 · 9da36463 · 71d33617 · 71d33617
Commit 71d33617 authored Apr 24, 2015 by John Chodera (MSKCC)
7 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/features.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/features.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/TestElement.py
+++ b/wrappers/python/tests/TestElement.py
--- a/wrappers/python/tests/systems/4TVP-dmj_wat-ion.psf
+++ b/wrappers/python/tests/systems/4TVP-dmj_wat-ion.psf
--- a/wrappers/python/tests/systems/gaffwat.parm7
+++ b/wrappers/python/tests/systems/gaffwat.parm7