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


No differences found