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)
commit6dcbf45abd9b592edd85cfc40c9e31916b6f017a
treeb9fde38367222ab6317dbd717697f669f57c67b6
parent982d0c0af93adaadd1dae77bc07f78a57bf824a2
parent65cf5de77c6c6a514a71e841ca5e2302e549d55f
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