projects / unres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 893f237 50adcf1)
Merge branch 'adasko' into devel
authorAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Tue, 17 Jul 2012 08:40:16 +0000 (04:40 -0400)
committerAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Tue, 17 Jul 2012 08:40:16 +0000 (04:40 -0400)
commit4daa6a111bf7e316526a17d254560c7ed7a78500
tree6d65f409f95e064ebcf5c7621504e6d976b23955tree | snapshot
parent893f2377f60fbd80bb147b8d2701e8af72c656e1commit | diff
parent50adcf129987c166452f741d4dbd6e8254f3e728commit | diff
Merge branch 'adasko' into devel

Dzialajacy D i L aminokwasy dla src_MD
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/wham/wham_multparm-ham_rep-oldparm
source/unres/src_MD/Makefile
source/unres/src_MD/Makefile_MPICH_ifort
source/unres/src_MD/cinfo.f
source/wham/src/Makefile
source/wham/src/cinfo.f
.gitignore diff1 | diff2 | blob | history
source/unres/src_MD/Makefile | diff2 | blob | history
source/unres/src_MD/cinfo.f | diff2 | blob | history
source/wham/src/energy_p_new.F diff1 | diff2 | blob | history
UNRESPACK 3.x