Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Sat, 16 Feb 2013 23:58:47 +0000 (00:58 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Sat, 16 Feb 2013 23:58:47 +0000 (00:58 +0100)
commit39bffec2e960cdaa362c075425c0aa94bbd673c9
tree3020e62132d5b678d7eab356433985397e151ad4
parent036e8e1e671a1293c1f636d9246e3dfd74f38ec1
parent393f080eded99a2b4fcc4d2dbf3b0f79fe3a3a26
Merge branch 'prerelease-3.2.1' into czarek

Conflicts:
bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/new/microcanonical/DYN_SS/hth/small.out_GB000
examples/unres/new/microcanonical/DYN_SS/hth/small_GB000.stat
examples/unres/new/microcanonical/DYN_SS/hth/small_MD000.pdb
source/unres/src_MD/Makefile_MPICH_ifort
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/parmread.F
source/unres/src_MD/ssMD.F
source/unres/src_MD/unres.F
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/new/microcanonical/DYN_SS/hth/small.out_GB000
examples/unres/new/microcanonical/DYN_SS/hth/small_MD000.pdb
source/unres/src_MD-M/energy_p_new_barrier.F
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/initialize_p.F
source/unres/src_MD/parmread.F