Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM
authorAnna Antoniak <anna@piasek4.chem.univ.gda.pl>
Fri, 21 May 2021 06:40:20 +0000 (08:40 +0200)
committerAnna Antoniak <anna@piasek4.chem.univ.gda.pl>
Fri, 21 May 2021 06:40:20 +0000 (08:40 +0200)
commitbc23440fbe68672d430f71f22f46b11265f003db
tree17aaae0d30143787490a47b25194cd5bd22a5a0f
parent3d3780d89d2885ee8700324ef832ef07ee35c45b
parent58cb5b8fe97f65aba46ef7c9a0d6ab38061d8cab
Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM

Conflicts:
source/unres/MD.F90
source/unres/MD.F90
source/unres/MREMD.F90
source/unres/data/energy_data.F90
source/unres/data/names.F90
source/unres/energy.F90
source/unres/geometry.F90
source/unres/io.F90
source/unres/io_config.F90