projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 81513f4)
Merge branch 'bartek2' into bartek
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:51:07 +0000 (17:51 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:51:07 +0000 (17:51 +0200)
Conflicts:
source/unres/src_CSA_DiL/energy_p_new_barrier.F
source/unres/src_CSA_DiL/parmread.F


No differences found
UNRESPACK 3.x