Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 31 Jul 2015 14:52:00 +0000 (16:52 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 31 Jul 2015 14:52:00 +0000 (16:52 +0200)
Conflicts:
source/unres/src_MD/readrtns.F
resolved

1  2 
source/unres/src_MD/readrtns.F

@@@ -2719,8 -2719,10 +2719,10 @@@ c    &    sigma_odl_temp(maxres,maxres,
        character*2 kic2
        character*24 model_ki_dist, model_ki_angle
        character*500 controlcard
 -      integer ki, i, j, k, l, ii_in_use(maxdim)
 +      integer ki, i, j, k, l, ii_in_use(maxdim),i_tmp,idomain_tmp
        logical lprn /.true./
+       integer ilen
+       external ilen
  c
  c     FP - Nov. 2014 Temporary specifications for new vars
  c