Merge branch 'adam' into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:02:39 +0000 (06:02 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:02:39 +0000 (06:02 -0400)
commitbd72b3c7ba94afc7170946f63180e7b7357a622d
tree0789d51bd2381559c5c4f13eb9ee9c72768e428f
parent16d49633e0da3cdae4cfb8f800f42c9df0cbb49c
parentd874ff1d64a6d91fbe946e36fdb3f379f97313db
Merge branch 'adam' into devel
Minor fixed in cxread diagnostics in wham
Conflicts:
source/unres/src_MD/Makefile
source/unres/src_MD/cinfo.f
source/wham/src/Makefile
source/wham/src/cinfo.f
source/unres/src_MD/Makefile
source/unres/src_MD/cinfo.f
source/wham/src/Makefile
source/wham/src/cinfo.f