projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6c33e0 caf0eb9)
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 10 Apr 2014 19:57:52 +0000 (15:57 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 10 Apr 2014 19:57:52 +0000 (15:57 -0400)
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe

1  2 
source/unres/src_MD-M/initialize_p.F patch | diff1 | diff2 | blob | history
source/unres/src_MD/initialize_p.F patch | diff1 | diff2 | blob | history

diff --cc source/unres/src_MD-M/initialize_p.F
Simple merge
diff --cc source/unres/src_MD/initialize_p.F
Simple merge
UNRESPACK 3.x