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

3cb25ad8 · Lee-Ping Wang · 7bfb75c7 · 24608623 · 3cb25ad8 · 3cb25ad8
Commit 3cb25ad8 authored Aug 25, 2013 by Lee-Ping Wang
20 changed files
--- a/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
+++ b/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
--- a/wrappers/python/simtk/openmm/app/modeller.py
+++ b/wrappers/python/simtk/openmm/app/modeller.py
--- a/wrappers/python/simtk/openmm/app/statedatareporter.py
+++ b/wrappers/python/simtk/openmm/app/statedatareporter.py
--- a/wrappers/python/simtk/openmm/vec3.py
+++ b/wrappers/python/simtk/openmm/vec3.py
--- a/wrappers/python/src/swig_doxygen/OpenMM.i
+++ b/wrappers/python/src/swig_doxygen/OpenMM.i
--- a/wrappers/python/src/swig_doxygen/swigInputBuilder.py
+++ b/wrappers/python/src/swig_doxygen/swigInputBuilder.py
--- 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/typemaps.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/typemaps.i
--- a/wrappers/python/tests/TestAmberPrmtopFile.py
+++ b/wrappers/python/tests/TestAmberPrmtopFile.py
--- a/wrappers/python/tests/TestForceField.py
+++ b/wrappers/python/tests/TestForceField.py
--- a/wrappers/python/tests/TestGromacsTopFile.py
+++ b/wrappers/python/tests/TestGromacsTopFile.py
--- a/wrappers/python/tests/TestModeller.py
+++ b/wrappers/python/tests/TestModeller.py
--- a/wrappers/python/tests/TestNumpyCompatibility.py
+++ b/wrappers/python/tests/TestNumpyCompatibility.py
--- a/wrappers/python/tests/systems/1T2Y.pdb
+++ b/wrappers/python/tests/systems/1T2Y.pdb
--- a/wrappers/python/tests/systems/alanine-dipeptide-explicit.pdb
+++ b/wrappers/python/tests/systems/alanine-dipeptide-explicit.pdb
--- a/wrappers/python/tests/systems/alanine-dipeptide-explicit.prmtop
+++ b/wrappers/python/tests/systems/alanine-dipeptide-explicit.prmtop
--- a/wrappers/python/tests/systems/alanine-dipeptide-implicit.pdb
+++ b/wrappers/python/tests/systems/alanine-dipeptide-implicit.pdb
--- a/wrappers/python/tests/systems/alanine-dipeptide-implicit.prmtop
+++ b/wrappers/python/tests/systems/alanine-dipeptide-implicit.prmtop
--- a/wrappers/python/tests/systems/explicit.top
+++ b/wrappers/python/tests/systems/explicit.top
--- a/wrappers/python/tests/systems/implicit.top
+++ b/wrappers/python/tests/systems/implicit.top