projects / unres4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 389b722 23537b0)
Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Mon, 28 Sep 2020 12:21:48 +0000 (14:21 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Mon, 28 Sep 2020 12:21:48 +0000 (14:21 +0200)
Conflicts:
source/unres/energy.F90


Trivial merge
UNRESPACK 4.x