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)
commita1cc397c3b60fa2db8a395db505702572c91453d
tree668e2d98599439b48f2615cc557e8f18d0bde0c9
parent15a1ab6260ac7b7159b386449312cecb0775153c
parent158e923530fe6036ef48f63ed0cd34c56a39eee6
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