Merge branch 'adam' into devel
authorAdam Liwo <adam@matrix.chem.cornell.edu>
Mon, 18 Jun 2012 13:58:32 +0000 (09:58 -0400)
committerAdam Liwo <adam@matrix.chem.cornell.edu>
Mon, 18 Jun 2012 13:58:32 +0000 (09:58 -0400)
commit951f0fe4ce7a66542c398754524d8ae3d9b5dc5a
tree6630c9d4e3f65fb1a22603b7d26983abafb89e1c
parente6be6f3432696603440b91ad5a5732214f003264
parent75b3ea58d504a01718b1cf658c0bbf81bbd36445
Merge branch 'adam' into devel
Merging adam with devel
Conflicts:
source/unres/src_CSA/readrtns_csa.F
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe~adam
source/unres/src_CSA/readrtns_csa.F
source/unres/src_CSA/unres_csa.F