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)
commit0a9d4161c6dab7e722b1113b6f0f6d98693e5fc6
treeb2a0907842ecffb1eea475c80e7010cca7a2802a
parentb824c9cd119555826c01272ef1ca83b3aa90b1ee
parenta8c261231194df97a87f97cfd287fb47499daa85
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