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)
commit0fcfcdb0d41d3ff88aadc59c6dbc2448c9c8fd4f
treeae754012d4fc6eac746500f9a58bcab155116e77
parentaa40279614f313ccfc4fc41dd028f8c3ac76d975
parent726dce23f2c5c67fc4d00db8e2b6c554b1775c80
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