From: Adam Kazimierz Sieradzan Date: Wed, 27 Jun 2012 11:53:41 +0000 (-0400) Subject: Merge branch 'adasko' into devel X-Git-Tag: v.3.2~79 X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=715dd743e8e9985863b30940b432a0e466620ea9 Merge branch 'adasko' into devel Conflicts: .gitignore bin/unres/MD/unres_ifort_MPICH_GAB.exe source/cluster/wham/src/DIMENSIONS.COMPAR source/cluster/wham/src/Makefile source/wham/src/Makefile source/wham/src/cinfo.f source/wham/src/tmptmp --- 715dd743e8e9985863b30940b432a0e466620ea9