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)
commit8889f8be9b85751ccce8d13da6dae495175f2885
treeb9fde38367222ab6317dbd717697f669f57c67b6
parent8421ab63ce0b8bbbfae73b37d47281229365565b
parente6c9d7374a2bc8cc32c886706d94997d8539ad37
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