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)
commit52187c9365594597457799445140ea830f1141a3
tree3cb862a0c950f7f318390be4caeedfe7a4d5efbb
parent951f0fe4ce7a66542c398754524d8ae3d9b5dc5a
parentaebadf9023e437f497f92dfcf2303c16f60917c1
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
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
18 files changed:
.gitignore
examples/unres/MD/ff_gab/1L2Y_minim.inp
source/cluster/wham/src/DIMENSIONS.COMPAR
source/cluster/wham/src/energy_p_new.F
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-M/unres.F
source/unres/src_MD/Makefile_MPICH_ifort
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F
source/unres/src_MIN/energy_p_new_barrier.F
source/wham/src/energy_p_new.F
source/xdrfpdb/src-M/xdrf2pdb-m.F
source/xdrfpdb/src/Makefile
source/xdrfpdb/src/xdrf2ang.f
source/xdrfpdb/src/xdrf2pdb-m.F