Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 20 Sep 2012 12:55:41 +0000 (08:55 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 20 Sep 2012 12:55:41 +0000 (08:55 -0400)
Conflicts:
bin/wham/wham_ifort_MPICH_GAB.exe

1  2 
bin/wham/wham_ifort_MPICH_GAB.exe

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