Merge branch 'master' into update_ug

76f7acf7 · Nate Stanley · 4fd6934b · c3847685 · 76f7acf7 · 76f7acf7
Commit 76f7acf7 authored Jan 27, 2016 by Nate Stanley
20 changed files
--- a/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaVdwForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaVdwForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaMultipoleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaWcaDispersionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaWcaDispersionForce.cpp