Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 9 Dec 2014 12:38:08 +0000 (13:38 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 9 Dec 2014 12:38:08 +0000 (13:38 +0100)
commit2a226bfc86eabc6e4eae0c3ad1cbc3cb5417a05a
tree5ca8c334572accf8a39554540c8375e3472f03f6
parenta0e685f844163003749ba91dfbf4644bcc8cfa30
parentf9e536df1fd1627429123fe8990edfcdc2cc1a9a
Merge branch 'prerelease-3.2.1' into czarek

Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
examples/unres/MD/microcanonical/DYN_SS/outputs/small.out_GB000
examples/unres/MD/microcanonical/DYN_SS/outputs/small_GB000.stat
examples/unres/MD/microcanonical/DYN_SS/outputs/small_MD000.pdb
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/geomout.F