projects / unres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3176770 71eb7b3)
Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 08:04:50 +0000 (09:04 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 08:04:50 +0000 (09:04 +0100)
commit4dfd5a32bfb40a62c23d814ac70bfef4cc085d63
treeea65b1445f3b5c66839d32227a2a378ece916ab8tree | snapshot
parent3176770f951fd8b689c14df6260e55fa4f479689commit | diff
parent71eb7b36d3b034724229216b2deecbff9ade78a1commit | diff
Merge branch 'prerelease-3.2.1' into czarek

Conflicts:
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
source/unres/src_MD/parmread.F
bin/unres/MD/unres_ifort_MPICH_GAB.exe blob1 | blob2 | history
source/unres/src_MD/energy_p_new_barrier.F diff1 | diff2 | blob | history
UNRESPACK 3.x