mmka.chem.univ.gda.pl Git - unres.git/commit

author	Adam Liwo <adam@piasek4.chem.univ.gda.pl>
	Sun, 10 May 2015 02:31:17 +0000 (04:31 +0200)
committer	Adam Liwo <adam@piasek4.chem.univ.gda.pl>
	Sun, 10 May 2015 02:31:17 +0000 (04:31 +0200)
commit	b0e240ff3f138add26fad4c2b35393a67db339ff
tree	483cbbaa8c0cfa853fe895022457b3c0b191cc3f	tree \| snapshot
parent	c7e16d60a52b2a133915a4f0a071fe87a76e45d0	commit \| diff
parent	02040289840cfc9fb0d926bc35ca5d488154327f	commit \| diff

Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

Conflicts:
source/unres/src_MD/intcartderiv.F

UNRESPACK 3.x

source/unres/src_CSA/geomout_min.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/DIMENSIONS	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/checkder_p.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/DIMENSIONS	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/geomout_min.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/unres_min.F	diff1 \|	diff2 \|	blob \| history