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

author	Cezary Czaplewski <czarek@chem.univ.gda.pl>
	Tue, 19 Feb 2013 00:10:29 +0000 (01:10 +0100)
committer	Cezary Czaplewski <czarek@chem.univ.gda.pl>
	Tue, 19 Feb 2013 00:10:29 +0000 (01:10 +0100)
commit	54e9809399896282963ceea15eadd20048a87430
tree	5a5315fac82ebea5a3b95100022eac966c1d2787	tree \| snapshot
parent	4dfd5a32bfb40a62c23d814ac70bfef4cc085d63	commit \| diff
parent	2e911abfe2c1ce5158812980b541e71d88ac6f6c	commit \| 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