Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Thu, 18 Dec 2014 09:03:24 +0000 (10:03 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Thu, 18 Dec 2014 09:03:24 +0000 (10:03 +0100)
commit94c9f54ff76d22351c0cd2f1b01e809515163940
treef198192213b4762d3189f3ca32f9573c2aedc74b
parent2a226bfc86eabc6e4eae0c3ad1cbc3cb5417a05a
parent456d8c7a2025617a7bd0f812eb7ba60a99e95856
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
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f