Merge branch 'master' into applecl

61d5cc0f · Peter · e2999354 · afae4bc8 · 61d5cc0f · 61d5cc0f
Commit 61d5cc0f authored Apr 16, 2015 by Peter
20 changed files
--- a/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomExternalIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomExternalIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomManyParticleIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomManyParticleIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceForce.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceForce.cpp
--- a/platforms/reference/src/gbsa/CpuGBVI.cpp
+++ b/platforms/reference/src/gbsa/CpuGBVI.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceLJCoulomb14.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceLJCoulomb14.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceLincsAlgorithm.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceLincsAlgorithm.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceMonteCarloBarostat.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceMonteCarloBarostat.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceNeighborList.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceNeighborList.cpp
--- a/platforms/reference/src/gbsa/CpuObc.cpp
+++ b/platforms/reference/src/gbsa/CpuObc.cpp
--- a/platforms/reference/src/SimTKReference/ReferencePME.cpp
+++ b/platforms/reference/src/SimTKReference/ReferencePME.cpp
--- a/platforms/reference/src/SimTKReference/ReferencePairIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferencePairIxn.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceProperDihedralBond.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceProperDihedralBond.cpp