Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
authorAdam Liwo <adam@matrix.chem.cornell.edu>
Mon, 18 Jun 2012 14:08:46 +0000 (10:08 -0400)
committerAdam Liwo <adam@matrix.chem.cornell.edu>
Mon, 18 Jun 2012 14:08:46 +0000 (10:08 -0400)
merge adam->devel (2nd attempt)
Conflicts:
.gitignore
bin/unres/MD/unres_ifort_MPICH_GAB.exe
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/unres/src_MIN/Makefile
source/xdrfpdb/src-M/xdrf
source/xdrfpdb/src/xdrf
source/xdrfpdb/src/xdrf2ang.f
source/xdrfpdb/src/xdrf2pdb-m.F


No differences found