projects / unres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 850bc15 f5379d3)
Merge branch 'master' of mmka:unres
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 09:48:55 +0000 (10:48 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 09:48:55 +0000 (10:48 +0100)
commit78c6b598700d2c701af6532afb20ebc905a0b8ef
tree1856d5c50a7e9c306e999f985448a0553d62ccd7tree | snapshot
parent850bc1577aa5a139a2bc5512cb29b1eb1c0e9b99commit | diff
parentf5379d3246c4bd95e946c4d35d4a1c13e329c4cbcommit | diff
Merge branch 'master' of mmka:unres

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/Makefile
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/stochfric.F
source/unres/src_MD/cinfo.f
source/wham/src-M/Makefile
source/wham/src/DIMENSIONS.FREE
17 files changed:
.gitignore diff1 | diff2 | blob | history
CMakeLists.txt diff1 | diff2 | blob | history
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe blob1 | blob2 | history
source/unres/src_MD-M/CMakeLists.txt diff1 | diff2 | blob | history
source/unres/src_MD-M/MD_A-MTS.F diff1 | diff2 | blob | history
source/unres/src_MD-M/energy_p_new_barrier.F diff1 | diff2 | blob | history
source/unres/src_MD-M/geomout.F diff1 | diff2 | blob | history
source/unres/src_MD-M/initialize_p.F diff1 | diff2 | blob | history
source/unres/src_MD-M/readrtns_CSA.F diff1 | diff2 | blob | history
source/unres/src_MD-M/sc_move.F diff1 | diff2 | blob | history
source/unres/src_MD/CMakeLists.txt diff1 | diff2 | blob | history
source/unres/src_MD/COMMON.SCCOR diff1 | diff2 | blob | history
source/unres/src_MD/energy_p_new_barrier.F diff1 | diff2 | blob | history
source/unres/src_MIN/CMakeLists.txt diff1 | diff2 | blob | history
source/wham/src-M/CMakeLists.txt diff1 | diff2 | blob | history
source/wham/src/CMakeLists.txt diff1 | diff2 | blob | history
source/wham/src/energy_p_new.F diff1 | diff2 | blob | history
UNRESPACK 3.x