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)
commitd4c9db7dff34eb2ef0c05cbf6d5e630be9745273
tree668e2d98599439b48f2615cc557e8f18d0bde0c9
parentf68815d6dfd4bc8d0c2e97acc9f68633390d6871
parent773d612babe20d91120d2991cf33e3350f139400
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
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe