Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Sat, 30 Jul 2022 10:58:20 +0000 (12:58 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Sat, 30 Jul 2022 10:58:20 +0000 (12:58 +0200)
Conflicts:
source/cluster/io_clust.F90
source/unres/data/energy_data.F90
source/unres/data/names.F90
source/unres/energy.F90
source/wham/enecalc.F90
source/wham/wham_calc.F90
source/wham/wham_data.F90


No differences found