Merge branch 'upstream' into fork

3862202e · Justin MacCallum · e1a4e015 · 73882ac5 · 3862202e · 3862202e
Commit 3862202e authored Jul 12, 2013 by Justin MacCallum
20 changed files
--- a/platforms/reference/tests/TestReferenceCMAPTorsionForce.cpp
+++ b/platforms/reference/tests/TestReferenceCMAPTorsionForce.cpp
--- a/platforms/reference/tests/TestReferenceCMMotionRemover.cpp
+++ b/platforms/reference/tests/TestReferenceCMMotionRemover.cpp
--- a/platforms/reference/tests/TestReferenceCustomBondForce.cpp
+++ b/platforms/reference/tests/TestReferenceCustomBondForce.cpp
--- a/platforms/reference/tests/TestReferenceCustomExternalForce.cpp
+++ b/platforms/reference/tests/TestReferenceCustomExternalForce.cpp
--- a/platforms/reference/tests/TestReferenceCustomIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceCustomIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceEwald.cpp
+++ b/platforms/reference/tests/TestReferenceEwald.cpp
--- a/platforms/reference/tests/TestReferenceGBSAOBCForce.cpp
+++ b/platforms/reference/tests/TestReferenceGBSAOBCForce.cpp
--- a/platforms/reference/tests/TestReferenceGBVIForce.cpp
+++ b/platforms/reference/tests/TestReferenceGBVIForce.cpp
--- a/platforms/reference/tests/TestReferenceHarmonicAngleForce.cpp
+++ b/platforms/reference/tests/TestReferenceHarmonicAngleForce.cpp
--- a/platforms/reference/tests/TestReferenceHarmonicBondForce.cpp
+++ b/platforms/reference/tests/TestReferenceHarmonicBondForce.cpp
--- a/platforms/reference/tests/TestReferenceLangevinIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceLangevinIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceMonteCarloBarostat.cpp
+++ b/platforms/reference/tests/TestReferenceMonteCarloBarostat.cpp
--- a/platforms/reference/tests/TestReferenceNeighborList.cpp
+++ b/platforms/reference/tests/TestReferenceNeighborList.cpp
--- a/platforms/reference/tests/TestReferenceNonbondedForce.cpp
+++ b/platforms/reference/tests/TestReferenceNonbondedForce.cpp
--- a/platforms/reference/tests/TestReferencePeriodicTorsionForce.cpp
+++ b/platforms/reference/tests/TestReferencePeriodicTorsionForce.cpp
--- a/platforms/reference/tests/TestReferenceRBTorsionForce.cpp
+++ b/platforms/reference/tests/TestReferenceRBTorsionForce.cpp
--- a/platforms/reference/tests/TestReferenceRandom.cpp
+++ b/platforms/reference/tests/TestReferenceRandom.cpp
--- a/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVerletIntegrator.cpp