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)
commiteb0ee5aa9234e4a56580f967363a14e0accfba01
tree6630c9d4e3f65fb1a22603b7d26983abafb89e1c
parente6be6f3432696603440b91ad5a5732214f003264
parente1fef2de19c19b83c13ffba39e91d7b4c54be0ff
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