Merge branch 'master' of github.com:SimTk/openmm

99ef4344 · Lee-Ping Wang · 471bea82 · 79fd69c3 · 99ef4344 · 99ef4344
Commit 99ef4344 authored Oct 24, 2013 by Lee-Ping Wang
16 changed files
--- a/wrappers/python/simtk/openmm/__init__.py
+++ b/wrappers/python/simtk/openmm/__init__.py
--- a/wrappers/python/simtk/openmm/app/__init__.py
+++ b/wrappers/python/simtk/openmm/app/__init__.py
--- a/wrappers/python/simtk/openmm/app/amberprmtopfile.py
+++ b/wrappers/python/simtk/openmm/app/amberprmtopfile.py
--- a/wrappers/python/simtk/openmm/app/desmonddmsfile.py
+++ b/wrappers/python/simtk/openmm/app/desmonddmsfile.py
--- a/wrappers/python/simtk/openmm/app/element.py
+++ b/wrappers/python/simtk/openmm/app/element.py
--- a/wrappers/python/simtk/openmm/app/gromacstopfile.py
+++ b/wrappers/python/simtk/openmm/app/gromacstopfile.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/internal/customgbforces.py
+++ b/wrappers/python/simtk/openmm/app/internal/customgbforces.py
--- a/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
+++ b/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
--- a/wrappers/python/simtk/openmm/app/pdbfile.py
+++ b/wrappers/python/simtk/openmm/app/pdbfile.py
--- a/wrappers/python/simtk/openmm/app/pdbreporter.py
+++ b/wrappers/python/simtk/openmm/app/pdbreporter.py
--- a/wrappers/python/simtk/openmm/app/statedatareporter.py
+++ b/wrappers/python/simtk/openmm/app/statedatareporter.py
--- a/wrappers/python/src/swig_doxygen/swigInputConfig.py
+++ b/wrappers/python/src/swig_doxygen/swigInputConfig.py
--- a/wrappers/python/tests/TestDesmondDMSFile.py
+++ b/wrappers/python/tests/TestDesmondDMSFile.py
--- a/wrappers/python/tests/systems/alanine-dipeptide-explicit-amber99SBILDN-tip3p.dms
+++ b/wrappers/python/tests/systems/alanine-dipeptide-explicit-amber99SBILDN-tip3p.dms
--- a/wrappers/python/tests/systems/alanine-dipeptide-explicit.pdb
+++ b/wrappers/python/tests/systems/alanine-dipeptide-explicit.pdb