resolving merge conflicts
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 18:55:41 +0000 (20:55 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 18:55:41 +0000 (20:55 +0200)
commitfb7cf58508affa71f482d468770ac9f8689900a3
tree361aae606840324ed8f00e0e49a7446b39af0e13
parent446f12ef8de6a998373ee9aa62f136e0933bf1b5
resolving merge conflicts
.gitignore
examples/unres/MD/ff_gab/1L2Y_minim.inp
source/cluster/wham/src/DIMENSIONS.COMPAR
source/cluster/wham/src/include_unres/COMMON.INTERACT
source/cluster/wham/src/include_unres/COMMON.SBRIDGE
source/cluster/wham/src/include_unres/COMMON.TORSION
source/unres/src_MD/cinfo.f
source/xdrfpdb/src/xdrf2ang.f
source/xdrfpdb/src/xdrf2pdb-m.F