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)
commit45ecbd61577e1d4fd690405e1f8348ddaa85eee1
tree688c47f8ecb8dc91185c107ffe98e6914caacec7
parent52187c9365594597457799445140ea830f1141a3
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