Merge branch 'master' of github.com:pandegroup/openmm into genpt

6bde69d9 · Andy Simmonett · e6dbc863 · ec799972 · 6bde69d9 · 6bde69d9
Commit 6bde69d9 authored Sep 25, 2015 by Andy Simmonett
7 changed files
--- a/tests/TestVariableLangevinIntegrator.h
+++ b/tests/TestVariableLangevinIntegrator.h
--- a/tests/TestVariableVerletIntegrator.h
+++ b/tests/TestVariableVerletIntegrator.h
--- a/tests/TestVerletIntegrator.h
+++ b/tests/TestVerletIntegrator.h
--- a/tests/TestVirtualSites.h
+++ b/tests/TestVirtualSites.h
--- a/platforms/cpu/tests/nacl_amorph.dat
+++ b/platforms/cpu/tests/nacl_amorph.dat
--- a/platforms/reference/tests/nacl_crystal.dat
+++ b/platforms/reference/tests/nacl_crystal.dat
--- a/wrappers/python/src/swig_doxygen/swig_lib/python/typemaps.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/typemaps.i