From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Mon, 18 Feb 2013 08:04:50 +0000 (+0100)
Subject: Merge branch 'prerelease-3.2.1' into czarek
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=4dfd5a32bfb40a62c23d814ac70bfef4cc085d63

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
---

4dfd5a32bfb40a62c23d814ac70bfef4cc085d63
diff --cc bin/unres/MD/unres_ifort_MPICH_GAB.exe
index 968912a,c8defa0..0000000
deleted file mode 100755,100755
Binary files differ