Merge branch 'lipid' into AFM
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 29 Sep 2015 17:54:56 +0000 (19:54 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 29 Sep 2015 17:54:56 +0000 (19:54 +0200)
commit25618f9f83673a7063414fe1e17415d138f58da8
tree398ddaa33422431524dfe0d353b541952a4b64f0
parent3444e732000b8e1ae809ef2fab7a828697a9eb78
parentc6588e178e83ce42d404f65fecf3dc0aa71764c5
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
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F
source/unres/src_MD-M/readrtns_CSA.F
source/wham/src-M/enecalc1.F
source/wham/src-M/energy_p_new.F
source/wham/src-M/initialize_p.F
source/wham/src-M/parmread.F
source/wham/src-M/readrtns.F