Merge branch 'multichain' into lipid
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 25 Jun 2015 10:31:05 +0000 (12:31 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 25 Jun 2015 10:31:05 +0000 (12:31 +0200)
commitee63e3c2690474ee368e6d7c6fd51dabec6a5406
tree66b16f1e6f61cfb1427ef5813900e2cb872e2e96
parentfe11b148c6a194dc08227d7d7bcb8979f1e4f11d
parent18010d3bb85a86b499dc4569225e21faffea9634
Merge branch 'multichain' into lipid

Conflicts:
source/unres/src_MD-M/MREMD.F
PARAM/scinter_GB_ext_lip.parm
source/unres/src_MD-M/chainbuild.F
source/unres/src_MD-M/initialize_p.F