Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorFelipe Pineda <pideca@hotmail.com>
Fri, 20 Feb 2015 10:23:07 +0000 (11:23 +0100)
committerFelipe Pineda <pideca@hotmail.com>
Fri, 20 Feb 2015 10:23:07 +0000 (11:23 +0100)
commit975ac9d0e487c8158844030a1f009da2ef9f579a
tree1da8d5a8d44e7c7881be9b35b3048cfa6a2b4247
parent300ba71bc245fd18664d59de0972b36fa1bb50b7
parent8ec3d140ec39f5aa5acf9ff6c3664881aa63faad
Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F