projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15a1ab6 158e923)
proba pullowania
authorAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Fri, 6 Jul 2012 07:42:07 +0000 (03:42 -0400)
committerAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Fri, 6 Jul 2012 07:42:07 +0000 (03:42 -0400)
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
source/unres/src_MD/cinfo.f
source/wham/src/cinfo.f

1  2 
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe patch | blob1 | blob2 | history

diff --cc bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
index c234c4d,1069e64..0000000
deleted file mode 100755,100755
Binary files differ
UNRESPACK 3.x