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

8df54762 · Lee-Ping Wang · 3cb25ad8 · 59854c5e · 8df54762 · 8df54762
Commit 8df54762 authored Nov 19, 2013 by Lee-Ping Wang
20 changed files
--- a/plugins/rpmd/openmmapi/include/openmm/RPMDIntegrator.h
+++ b/plugins/rpmd/openmmapi/include/openmm/RPMDIntegrator.h
--- a/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp
+++ b/plugins/rpmd/openmmapi/src/RPMDIntegrator.cpp
--- a/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.cpp
--- a/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+++ b/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
--- a/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.cpp
--- a/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+++ b/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
--- 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/FortranWrapper_Header.xslt
+++ b/wrappers/FortranWrapper_Header.xslt
--- 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/amberprmtopfile.py
+++ b/wrappers/python/simtk/openmm/app/amberprmtopfile.py
--- a/wrappers/python/simtk/openmm/app/data/hydrogens.xml
+++ b/wrappers/python/simtk/openmm/app/data/hydrogens.xml
--- a/wrappers/python/simtk/openmm/app/data/residues.xml
+++ b/wrappers/python/simtk/openmm/app/data/residues.xml
--- 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/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py
--- a/wrappers/python/simtk/openmm/app/gromacstopfile.py
+++ b/wrappers/python/simtk/openmm/app/gromacstopfile.py