Merge branch 'AFM' into multichain
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 6 Aug 2015 07:01:16 +0000 (09:01 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 6 Aug 2015 07:01:16 +0000 (09:01 +0200)
commit8df996bdc4bc56846b3799e9a2d47c24a9273125
tree85b638dc21a73daae2e1e3205c44fb0e6101a3db
parentad2687da4ea0c0ddde6c400a60c4817a689b3dff
parent8aafca27bccb6ad8deb5a7c8ead021d301ed4afc
Merge branch 'AFM' into multichain
source/unres/src_MD-M/chainbuild.F
source/unres/src_MD-M/energy_p_new_barrier.F