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)
Conflicts:
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/unres.F

1  2 
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F

Simple merge