Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorFelipe Pineda <pideca@hotmail.com>
Wed, 4 Mar 2015 10:22:26 +0000 (11:22 +0100)
committerFelipe Pineda <pideca@hotmail.com>
Wed, 4 Mar 2015 10:22:26 +0000 (11:22 +0100)
commit0ad81c1146dbea50948a85b83a75d90f2d49d083
treeb37f31f29e68573438b83a53efa1ea63807fa8e0
parent640bb912c3b2b3ca0742fa4d15735e0eea2e7744
parent01c3eb1a73e84ef1e5a40828c38bcb3e2aaedb21
Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/cinfo.f
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/readrtns.F