Merge branch 'multichain' into lipid
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 18 Mar 2015 13:11:32 +0000 (14:11 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 18 Mar 2015 13:11:32 +0000 (14:11 +0100)
commit4ca1e88a5f4f23619f7eaa7edcc35d5c4aca9b8c
tree1d60438b872c8f4aacdf4f308e866a84dd4d4f8e
parentfbad69b401dd3265da402f76b365aa80f6a99135
parentdea2e7e9c8a159fba253863186d91d90930f17c6
Merge branch 'multichain' into lipid

Conflicts:
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/unres.F
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F