Merge branch 'master' into nucleic

fd473eea · Peter Eastman · 0a751b5b · 6a985cfd · fd473eea · fd473eea
Commit fd473eea authored Oct 29, 2015 by Peter Eastman
2 changed files
--- a/wrappers/python/tests/systems/par_all22_prot.inp
+++ b/wrappers/python/tests/systems/par_all22_prot.inp
--- a/wrappers/python/tests/systems/par_all22_prot_with_mass.inp
+++ b/wrappers/python/tests/systems/par_all22_prot_with_mass.inp