From: Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Date: Fri, 6 Jul 2012 07:42:07 +0000 (-0400)
Subject: proba pullowania
X-Git-Tag: v.3.2~72^2~10
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=a1cc397c3b60fa2db8a395db505702572c91453d

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
---

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