projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 25618f9)
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)
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


No differences found
UNRESPACK 3.x