Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Sun, 17 Feb 2013 02:19:35 +0000 (03:19 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Sun, 17 Feb 2013 02:19:35 +0000 (03:19 +0100)
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F


No differences found