From: Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Date: Wed, 18 Mar 2015 13:11:32 +0000 (+0100)
Subject: Merge branch 'multichain' into lipid
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=4ca1e88a5f4f23619f7eaa7edcc35d5c4aca9b8c

Merge branch 'multichain' into lipid

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

4ca1e88a5f4f23619f7eaa7edcc35d5c4aca9b8c