projects / unres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9c2b81 b009c0d)
Merge branch 'prerelease-3.2.1'
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
commit65c7c448c98f2860c26765203ee15798231865cf
treec8ddad1b5403b58bfc8cae9a3b6049fcf105ff67tree | snapshot
parentb9c2b8110f11bf7d97e62bbfd6f9f123e957baddcommit | diff
parentb009c0d2776fae7fc882e7a93508998fa61a34cccommit | diff
Merge branch 'prerelease-3.2.1'

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/wham/wham-mult_ifort_MPICH-GAB.exe
source/cluster/unres/src/arcos.f
source/cluster/wham/src-M/arcos.f
source/cluster/wham/src/arcos.f
source/wham/src-M/arcos.f
source/wham/src/arcos.f
source/xdrfpdb/src-M/arcos.f
source/xdrfpdb/src/arcos.f
CMakeLists.txt diff1 | diff2 | blob | history
bin/unres/MD/unres_E0LL2Y.csh diff1 | diff2 | blob | history
bin/xdrfpdb/xdrf2ang diff1 | | blob | history
bin/xdrfpdb/xdrf2pdb diff1 | diff2 | blob | history
bin/xdrfpdb/xdrf2pdb-m diff1 | diff2 | blob | history
bin/xdrfpdb/xdrf2pdb-m-mult diff1 | diff2 | blob | history
bin/xdrfpdb/xdrf2pdb-mult diff1 | diff2 | blob | history
bin/xdrfpdb/xdrf2x diff1 | | blob | history
UNRESPACK 3.x