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)
commit4f8c4eafa5d9efecf8807b85484ba718ac0e7d0e
tree0789d51bd2381559c5c4f13eb9ee9c72768e428f
parent3535409e2b18552011565bc5d8c3414a5d94a66d
parentb666e9fc62f4fd4d9983643bf7bac86a0ca0f31b
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