From: Adam Kazimierz Sieradzan Date: Fri, 6 Jul 2012 07:42:07 +0000 (-0400) Subject: proba pullowania X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=d4c9db7dff34eb2ef0c05cbf6d5e630be9745273;p=unres.git proba pullowania 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 --- d4c9db7dff34eb2ef0c05cbf6d5e630be9745273 diff --cc bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe index c234c4d,1069e64..0000000 deleted file mode 100755,100755 Binary files differ