From: Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Date: Tue, 29 Sep 2015 17:54:56 +0000 (+0200)
Subject: Merge branch 'lipid' into AFM
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=0a9d4161c6dab7e722b1113b6f0f6d98693e5fc6;hp=0a9d4161c6dab7e722b1113b6f0f6d98693e5fc6;p=unres.git

Merge branch 'lipid' into AFM

Conflicts:
	source/wham/src-M/DIMENSIONS.ZSCOPT
	source/wham/src-M/energy_p_new.F
	source/wham/src-M/initialize_p.F
	source/wham/src-M/parmread.F
---