Merge branch 'multichain' of mmka:unres into lipid
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 4 Mar 2015 21:12:29 +0000 (22:12 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 4 Mar 2015 21:12:29 +0000 (22:12 +0100)
1  2 
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F

Simple merge