Merged fork with latest original master

dca54ec7 · Saurabh Belsare · cace5edf · 01f9e415 · dca54ec7 · dca54ec7
Commit dca54ec7 authored Jun 30, 2016 by Saurabh Belsare
4 changed files
--- a/wrappers/python/tests/systems/par_all36_cgenff.prm
+++ b/wrappers/python/tests/systems/par_all36_cgenff.prm
--- a/wrappers/python/tests/systems/test_amber_ff.xml
+++ b/wrappers/python/tests/systems/test_amber_ff.xml
--- a/wrappers/python/tests/systems/tip5p.pdb
+++ b/wrappers/python/tests/systems/tip5p.pdb
--- a/wrappers/python/tests/systems/top_all36_cgenff.rtf
+++ b/wrappers/python/tests/systems/top_all36_cgenff.rtf