Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorFelipe Pineda <pideca@hotmail.com>
Wed, 25 Feb 2015 14:03:08 +0000 (15:03 +0100)
committerFelipe Pineda <pideca@hotmail.com>
Wed, 25 Feb 2015 14:03:08 +0000 (15:03 +0100)
commit617f034382914c46e7a0bc22a2b10474b040e65b
tree3eec5689b706d88572c6e945a927dc6824be5f5e
parent4efe681fd37fcae5abd465271e6f6e64729a6731
parent83c89a4b9b96438e18c6373adff2f2507e8a1837
Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y_2.exe
source/unres/src_MD/cinfo.f
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/readrtns.F