Merge remote-tracking branch 'upstream/master'

eb232608 · John Chodera (MSKCC) · 62581e9c · 7f8c5089 · eb232608 · eb232608
Commit eb232608 authored Apr 22, 2015 by John Chodera (MSKCC)
20 changed files
--- a/plugins/rpmd/openmmapi/src/RPMDMonteCarloBarostat.cpp
+++ b/plugins/rpmd/openmmapi/src/RPMDMonteCarloBarostat.cpp
--- a/plugins/rpmd/openmmapi/src/RPMDMonteCarloBarostatImpl.cpp
+++ b/plugins/rpmd/openmmapi/src/RPMDMonteCarloBarostatImpl.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/serialization/src/StateProxy.cpp
+++ b/serialization/src/StateProxy.cpp
--- a/serialization/tests/TestSerializeState.cpp
+++ b/serialization/tests/TestSerializeState.cpp
--- a/tests/TestSystem.cpp
+++ b/tests/TestSystem.cpp
--- a/wrappers/python/simtk/openmm/app/charmmpsffile.py
+++ b/wrappers/python/simtk/openmm/app/charmmpsffile.py
--- a/wrappers/python/simtk/openmm/app/data/amoeba2013.xml
+++ b/wrappers/python/simtk/openmm/app/data/amoeba2013.xml
--- a/wrappers/python/simtk/openmm/app/data/amoeba2013_gk.xml
+++ b/wrappers/python/simtk/openmm/app/data/amoeba2013_gk.xml
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.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/pdbstructure.py
+++ b/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
--- a/wrappers/python/simtk/openmm/app/internal/unitcell.py
+++ b/wrappers/python/simtk/openmm/app/internal/unitcell.py
--- a/wrappers/python/simtk/openmm/app/modeller.py
+++ b/wrappers/python/simtk/openmm/app/modeller.py
--- a/wrappers/python/simtk/openmm/app/pdbfile.py
+++ b/wrappers/python/simtk/openmm/app/pdbfile.py