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

855ece90 · leeping · 471bea82 · a42c55ad · 855ece90 · 855ece90
Commit 855ece90 authored Oct 17, 2013 by leeping
15 changed files
--- a/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
--- a/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
+++ b/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
--- a/tests/TestParser.cpp
+++ b/tests/TestParser.cpp
--- a/wrappers/python/setup.py
+++ b/wrappers/python/setup.py
--- 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/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/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/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