Merge branch 'master' of mmka:unres into multichain
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 09:40:58 +0000 (10:40 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 09:40:58 +0000 (10:40 +0100)
Conflicts:
.gitignore
bin/cluster/unres_clustMD-mult_MPICH-GAB.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe
bin/unres_clustMD_MPI-oldparm
bin/wham/wham_multparm-ham_rep-oldparm
source/cluster/wham/src/COMMON.SCCOR
source/cluster/wham/src/Makefile
source/unres/src_MD-M/MREMD.F
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/stochfric.F
source/unres/src_MD-M/unres.F
source/unres/src_MD/cinfo.f
source/wham/src-M/Makefile
source/wham/src/DIMENSIONS.FREE


No differences found