projects / unres4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0a4a15 50fbf27)
Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM
authorAgnieszka Lipska <lypstyk@gmail.com>
Tue, 12 Nov 2019 12:56:28 +0000 (13:56 +0100)
committerAgnieszka Lipska <lypstyk@gmail.com>
Tue, 12 Nov 2019 12:56:28 +0000 (13:56 +0100)
1  2 
source/unres/energy.F90 patch | diff1 | diff2 | blob | history
source/unres/io_config.F90 patch | diff1 | diff2 | blob | history

diff --cc source/unres/energy.F90
Simple merge
diff --cc source/unres/io_config.F90
Simple merge
UNRESPACK 4.x