From: Adam Liwo <jal47@matrix.chem.cornell.edu>
Date: Thu, 20 Sep 2012 12:55:41 +0000 (-0400)
Subject: Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
X-Git-Tag: v.3.2~69
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=9599888d279b89c6e0ed41d57caf7160fc54f9e3

Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
	bin/wham/wham_ifort_MPICH_GAB.exe
---

9599888d279b89c6e0ed41d57caf7160fc54f9e3
diff --cc bin/wham/wham_ifort_MPICH_GAB.exe
index e1c4ae5,4e65a3b..0000000
deleted file mode 100755,100755
Binary files differ