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)
commit3176770f951fd8b689c14df6260e55fa4f479689
treea85d615b8abfc167fda5f9de4e71d7b35be058bd
parent39bffec2e960cdaa362c075425c0aa94bbd673c9
parent6faa406438bff5968dc4a386929745cfaf554352
Merge branch 'prerelease-3.2.1' into czarek

Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/geomout.F
source/unres/src_MD/readrtns.F